Changeset 338d54a7 in mainline for uspace/dist/src/c/demos/top/screen.c

Timestamp:

2018-03-10T22:55:07Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

850fd32

Parents:

5ef16903

Message:

Gratuitous nested block makes ccheck sad.

File:

• uspace/dist/src/c/demos/top/screen.c (modified) (4 diffs)

uspace/dist/src/c/demos/top/screen.c

@@ -45 +45 @@
 #include <inttypes.h>
 #include <macros.h>
+#include <str.h>
 #include "screen.h"
 #include "top.h"
@@ -389 +390 @@
                 int width = table->columns[column_index].width;
                 field_t *field = &table->fields[i];
+                uint64_t val;
+                const char *psuffix;
+                char suffix;
 
                 if (column_index != 0) {
@@ -406 +410 @@
                         printf("%*" PRIu64, width, field->uint);
                         break;
-                case FIELD_UINT_SUFFIX_BIN: {
-                        uint64_t val = field->uint;
-                        const char *suffix;
+                case FIELD_UINT_SUFFIX_BIN:
+                        val = field->uint;
                         width -= 3;
-                        bin_order_suffix(val, &val, &suffix, true);
-                        printf("%*" PRIu64 "%s", width, val, suffix);
-                        break;
-                }
-                case FIELD_UINT_SUFFIX_DEC: {
-                        uint64_t val = field->uint;
-                        char suffix;
+                        bin_order_suffix(val, &val, &psuffix, true);
+                        printf("%*" PRIu64 "%s", width, val, psuffix);
+                        break;
+                case FIELD_UINT_SUFFIX_DEC:
+                        val = field->uint;
                         width -= 1;
                         order_suffix(val, &val, &suffix);
                         printf("%*" PRIu64 "%c", width, val, suffix);
                         break;
-                }
                 case FIELD_PERCENT:
                         width -= 5; /* nnn.% */
@@ -537 +537 @@
  *
  */
-errno_t tgetchar(unsigned int sec)
+int tgetchar(unsigned int sec)
 {
         /*