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

Timestamp:

2018-04-04T15:42:37Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2c4e1cc

Parents:

47b2d7e3

Message:

Fix cstyle: make ccheck-fix and commit only files where all the changes are good.

File:

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

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

@@ -88 +88 @@
                 help_cmd_cat(HELP_SHORT);
                 printf(
-                "Usage:  %s [options] <file1> [file2] [...]\n"
-                "Options:\n"
-                "  -h, --help       A short option summary\n"
-                "  -v, --version    Print version information and exit\n"
-                "  -H, --head ##    Print only the first ## bytes\n"
-                "  -t, --tail ##    Print only the last ## bytes\n"
-                "  -b, --buffer ##  Set the read buffer size to ##\n"
-                "  -m, --more       Pause after each screen full\n"
-                "  -x, --hex        Print bytes as hex values\n"
-                "  -s, --stdin      Treat `-' in file list as standard input\n"
-                "  -n, --number     Number all output lines\n"
-                "Currently, %s is under development, some options don't work.\n",
-                cmdname, cmdname);
+                    "Usage:  %s [options] <file1> [file2] [...]\n"
+                    "Options:\n"
+                    "  -h, --help       A short option summary\n"
+                    "  -v, --version    Print version information and exit\n"
+                    "  -H, --head ##    Print only the first ## bytes\n"
+                    "  -t, --tail ##    Print only the last ## bytes\n"
+                    "  -b, --buffer ##  Set the read buffer size to ##\n"
+                    "  -m, --more       Pause after each screen full\n"
+                    "  -x, --hex        Print bytes as hex values\n"
+                    "  -s, --stdin      Treat `-' in file list as standard input\n"
+                    "  -n, --number     Number all output lines\n"
+                    "Currently, %s is under development, some options don't work.\n",
+                    cmdname, cmdname);
         }
 
@@ -108 +108 @@
 static void waitprompt(void)
 {
-        console_set_pos(console, 0, console_rows-1);
+        console_set_pos(console, 0, console_rows - 1);
         console_set_color(console, COLOR_WHITE, COLOR_BLUE, 0);
 
         printf("ENTER/SPACE/PAGE DOWN - next page, "
-               "ESC/Q - quit, C - continue unpaged");
+            "ESC/Q - quit, C - continue unpaged");
         fflush(stdout);
 
@@ -265 +265 @@
                         for (i = 0; i < bytes && !should_quit; i++) {
                                 if (hex) {
-                                        paged_char(hexchars[((uint8_t)buff[i])/16]);
-                                        paged_char(hexchars[((uint8_t)buff[i])%16]);
-                                        paged_char(((count+i+1) & 0xf) == 0 ? '\n' : ' ');
-                                }
-                                else {
+                                        paged_char(hexchars[((uint8_t)buff[i]) / 16]);
+                                        paged_char(hexchars[((uint8_t)buff[i]) % 16]);
+                                        paged_char(((count + i + 1) & 0xf) == 0 ? '\n' : ' ');
+                                } else {
                                         wchar_t c = str_decode(buff, &offset, bytes);
                                         if (c == 0) {
@@ -353 +352 @@
                         return CMD_SUCCESS;
                 case 'H':
-                        if (!optarg || str_uint64_t(optarg, NULL, 10, false, &head) != EOK ) {
+                        if (!optarg || str_uint64_t(optarg, NULL, 10, false, &head) != EOK) {
                                 puts("Invalid head size\n");
                                 return CMD_FAILURE;
@@ -359 +358 @@
                         break;
                 case 't':
-                        if (!optarg || str_uint64_t(optarg, NULL, 10, false, &tail) != EOK ) {
+                        if (!optarg || str_uint64_t(optarg, NULL, 10, false, &tail) != EOK) {
                                 puts("Invalid tail size\n");
                                 return CMD_FAILURE;
@@ -367 +366 @@
                         break;
                 case 'b':
-                        if (!optarg || str_size_t(optarg, NULL, 10, false, &buffer) != EOK ) {
+                        if (!optarg || str_size_t(optarg, NULL, 10, false, &buffer) != EOK) {
                                 puts("Invalid buffer size\n");
                                 return CMD_FAILURE;
@@ -391 +390 @@
         if (argc < 1) {
                 printf("%s - incorrect number of arguments. Try `%s --help'\n",
-                        cmdname, cmdname);
+                    cmdname, cmdname);
                 return CMD_FAILURE;
         }