Changeset 1433ecda in mainline for uspace/app/blkdump/blkdump.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/blkdump/blkdump.c (modified) (10 diffs)

uspace/app/blkdump/blkdump.c

@@ -79 +79 @@
         }
 
-        --argc; ++argv;
+        --argc;
+        ++argv;
 
         if (str_cmp(*argv, "--toc") == 0) {
-                --argc; ++argv;
+                --argc;
+                ++argv;
                 toc = true;
                 goto devname;
@@ -88 +90 @@
 
         if (str_cmp(*argv, "--relative") == 0) {
-                --argc; ++argv;
+                --argc;
+                ++argv;
                 relative = true;
         }
 
         if (str_cmp(*argv, "--offset") == 0) {
-                --argc; ++argv;
+                --argc;
+                ++argv;
                 if (*argv == NULL) {
                         printf(NAME ": Error, argument missing (offset).\n");
@@ -107 +111 @@
                 }
 
-                --argc; ++argv;
+                --argc;
+                ++argv;
         }
 
         if (str_cmp(*argv, "--count") == 0) {
-                --argc; ++argv;
+                --argc;
+                ++argv;
                 if (*argv == NULL) {
                         printf(NAME ": Error, argument missing (count).\n");
@@ -125 +131 @@
                 }
 
-                --argc; ++argv;
+                --argc;
+                ++argv;
         }
 
@@ -196 +203 @@
                 }
 
-                printf("---- Block %" PRIuOFF64 " (at %" PRIuOFF64 ") ----\n", current, current*block_size);
+                printf("---- Block %" PRIuOFF64 " (at %" PRIuOFF64 ") ----\n", current, current * block_size);
 
                 for (data_offset = 0; data_offset < block_size; data_offset += 16) {
                         if (relative) {
                                 printf("%8" PRIxOFF64 ": ", (aoff64_t) data_offset);
+                        } else {
+                                printf("%8" PRIxOFF64 ": ", current * block_size + data_offset);
                         }
-                        else {
-                                printf("%8" PRIxOFF64 ": ", current*block_size + data_offset);
-                        }
-                        print_hex_row(data+data_offset, block_size-data_offset, 16);
+                        print_hex_row(data + data_offset, block_size - data_offset, 16);
                         printf("\n");
                 }
@@ -238 +244 @@
  * Print a row of 16 bytes as commonly seen in hexadecimal dumps
  */
-static void print_hex_row(uint8_t *data, size_t length, size_t bytes_per_row) {
+static void print_hex_row(uint8_t *data, size_t length, size_t bytes_per_row)
+{
         size_t pos;
         uint8_t b;
@@ -248 +255 @@
         /* Print hexadecimal values */
         for (pos = 0; pos < length; pos++) {
-                if (pos == length/2) {
+                if (pos == length / 2) {
                         printf(" ");
                 }
@@ -256 +263 @@
         /* Pad with spaces if we have less than 16 bytes */
         for (pos = length; pos < bytes_per_row; pos++) {
-                if (pos == length/2) {
+                if (pos == length / 2) {
                         printf(" ");
                 }
@@ -264 +271 @@
         /* Print printable characters */
         for (pos = 0; pos < length; pos++) {
-                if (pos == length/2) {
+                if (pos == length / 2) {
                         printf(" ");
                 }
@@ -270 +277 @@
                 if (b >= 32 && b < 128) {
                         putchar(b);
-                }
-                else {
+                } else {
                         putchar('.');
                 }