Changeset 89ac5513 in mainline for uspace/app/bdsh/cmds/modules

Timestamp:

2013-06-23T19:54:53Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddb1922

Parents:

3abf0760 (diff), 96cbd18 (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.

Location:

uspace/app/bdsh/cmds/modules

Files:

• bdd/bdd.c (deleted)
• bdd/bdd.h (deleted)
• bdd/bdd_def.h (deleted)
• bdd/entry.h (deleted)
• cmp/cmp.c (modified) (1 diff)
• modules.h (modified) (2 diffs)
• sleep/sleep.c (modified) (1 diff)

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

@@ -107 +107 @@
 
                 if (offset[0] != offset[1] ||
-                    bcmp(buffer[0], buffer[1], offset[0])) {
+                    memcmp(buffer[0], buffer[1], offset[0]) != 0) {
                         rc = 1;
                         goto end;

uspace/app/bdsh/cmds/modules/modules.h

@@ -50 +50 @@
 #include "mkfile/entry.h"
 #include "rm/entry.h"
-#include "bdd/entry.h"
 #include "cat/entry.h"
 #include "touch/entry.h"
@@ -74 +73 @@
 #include "mkfile/mkfile_def.h"
 #include "rm/rm_def.h"
-#include "bdd/bdd_def.h"
 #include "cat/cat_def.h"
 #include "touch/touch_def.h"

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 */