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

Timestamp:

2013-07-24T17:42:25Z (13 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/cmp/cmp.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;