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

Timestamp:

2015-07-28T11:28:14Z (9 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

6accc5cf

Parents:

df2bce3 (diff), 47726b5e (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 from the mainline

File:

• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (4 diffs)

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

@@ -108 +108 @@
 }
 
-static void waitprompt()
+static void waitprompt(void)
 {
         console_set_pos(console, 0, console_rows-1);
@@ -120 +120 @@
 }
 
-static void waitkey()
+static void waitkey(void)
 {
         cons_event_t ev;
@@ -149 +149 @@
 }
 
-static void newpage()
+static void newpage(void)
 {
         console_clear(console);
@@ -324 +324 @@
         argc = cli_count_args(argv);
 
-        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
+        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
                 c = getopt_long(argc, argv, "xhvmH:t:b:s:n", long_options, &opt_ind);
                 switch (c) {