Print this page
4823 don't open-code NSEC2MSEC and MSEC2NSEC

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libdlpi/common/libdlpi.c
          +++ new/usr/src/lib/libdlpi/common/libdlpi.c
↓ open down ↓ 1331 lines elided ↑ open up ↑
1332 1332          ctl.buf = (dlreplyp == NULL) ? bufc : (void *)dlreplyp->dlm_msg;
1333 1333          ctl.len = 0;
1334 1334          ctl.maxlen = (dlreplyp == NULL) ? sizeof (bufc) : dlreplyp->dlm_msgsz;
1335 1335  
1336 1336          data.buf = (databuf == NULL) ? bufd : databuf;
1337 1337          data.len = 0;
1338 1338          data.maxlen = (databuf == NULL) ? sizeof (bufd): *datalenp;
1339 1339  
1340 1340          for (;;) {
1341 1341                  if (!infinite)
1342      -                        start = gethrtime() / (NANOSEC / MILLISEC);
     1342 +                        start = NSEC2MSEC(gethrtime());
1343 1343  
1344 1344                  switch (poll(&pfd, 1, msec)) {
1345 1345                  default:
1346 1346                          if (pfd.revents & POLLHUP)
1347 1347                                  return (DL_SYSERR);
1348 1348                          break;
1349 1349                  case 0:
1350 1350                          return (DLPI_ETIMEDOUT);
1351 1351                  case -1:
1352 1352                          return (DL_SYSERR);
↓ open down ↓ 95 lines elided ↑ open up ↑
1448 1448                                          return (DLPI_EBADMSG);
1449 1449  
1450 1450                                  /* Is it ours? */
1451 1451                                  if (dlprim->error_ack.dl_error_primitive ==
1452 1452                                      dlreqprim)
1453 1453                                          break;
1454 1454                          }
1455 1455                  }
1456 1456  update_timer:
1457 1457                  if (!infinite) {
1458      -                        current = gethrtime() / (NANOSEC / MILLISEC);
     1458 +                        current = NSEC2MSEC(gethrtime());
1459 1459                          msec -= (current - start);
1460 1460  
1461 1461                          if (msec <= 0)
1462 1462                                  return (DLPI_ETIMEDOUT);
1463 1463                  }
1464 1464          }
1465 1465  
1466 1466          return (DLPI_SUCCESS);
1467 1467  }
1468 1468  
↓ open down ↓ 368 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX