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

Timestamp:

2013-07-24T17:42:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

Message:

merge mainline changes.

usb hc macro changes from mainline were reverted, too many conflicts

File:

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

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

@@ -67 +67 @@
         uint64_t whole_seconds;
         uint64_t frac_seconds;
-        char *endptr;
+        const char *endptr;
 
         /* Check for whole seconds */
@@ -114 +114 @@
         int ret;
         unsigned int argc;
-        useconds_t duration;
+        useconds_t duration = 0;
 
         /* Count the arguments */