Changeset 231b3fd in mainline for uspace/app/bdsh/cmds/modules/sleep/sleep.c

Timestamp:

2018-08-25T21:35:26Z (7 years ago)

Author:

GitHub <noreply@…>

Parents:

e2625b1a (diff), 3c45353 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jakub Jermář <jakub@…> (2018-08-25 21:35:26)

git-committer:

GitHub <noreply@…> (2018-08-25 21:35:26)

Message:

Merge 3c453534a2b093c8039d8e8059b923c71f3492a3 into e2625b1a1e5a2895b86f0e39c2d70a39e49e042a

File:

• uspace/app/bdsh/cmds/modules/sleep/sleep.c (modified) (6 diffs)

uspace/app/bdsh/cmds/modules/sleep/sleep.c

@@ -57 +57 @@
 }
 
-/** Convert string containing decimal seconds to useconds_t.
+/** Convert string containing decimal seconds to usec_t.
  *
  * @param nptr   Pointer to string.
@@ -63 +63 @@
  * @return EOK if conversion was successful.
  */
-static errno_t decimal_to_useconds(const char *nptr, useconds_t *result)
+static errno_t decimal_to_useconds(const char *nptr, usec_t *result)
 {
         errno_t ret;
-        uint64_t whole_seconds;
-        uint64_t frac_seconds;
+        sec_t whole_seconds;
+        usec_t frac_seconds;
         const char *endptr;
 
@@ -75 +75 @@
                 endptr = (char *)nptr;
         } else {
-                ret = str_uint64_t(nptr, &endptr, 10, false, &whole_seconds);
+                ret = str_int64_t(nptr, &endptr, 10, false, &whole_seconds);
                 if (ret != EOK)
                         return ret;
@@ -87 +87 @@
         } else if (*endptr == '.') {
                 nptr = endptr + 1;
-                ret = str_uint64_t(nptr, &endptr, 10, true, &frac_seconds);
+                ret = str_int64_t(nptr, &endptr, 10, true, &frac_seconds);
                 if (ret != EOK)
                         return ret;
@@ -101 +101 @@
 
         /* Check for overflow */
-        useconds_t total = whole_seconds * 1000000 + frac_seconds;
-        if (total / 1000000 != whole_seconds)
+        usec_t total = SEC2USEC(whole_seconds) + frac_seconds;
+        if (USEC2SEC(total) != whole_seconds)
                 return EOVERFLOW;
 
@@ -115 +115 @@
         errno_t ret;
         unsigned int argc;
-        useconds_t duration = 0;
+        usec_t duration = 0;
 
         /* Count the arguments */