Changeset 92574f4 in mainline for uspace/app/bdsh/cmds/modules/cat/cat.c

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (1 diff)

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

@@ -144 +144 @@
                         return CMD_SUCCESS;
                 case 'H':
-                        printf(cat_oops);
+                        printf("%s", cat_oops);
                         return CMD_FAILURE;
                 case 't':
-                        printf(cat_oops);
+                        printf("%s", cat_oops);
                         return CMD_FAILURE;
                 case 'b':
-                        printf(cat_oops);
+                        printf("%s", cat_oops);
                         break;
                 case 'm':
-                        printf(cat_oops);
+                        printf("%s", cat_oops);
                         return CMD_FAILURE;
                 }