Changeset d76a329 in mainline

Timestamp:

2012-04-16T20:08:30Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b1213b0

Parents:

f76696f

Message:

Fix cstyle.

Location:

uspace/app/top

Files:

• screen.c (modified) (1 diff)
• top.c (modified) (3 diffs)

uspace/app/top/screen.c

@@ -400 +400 @@
 
                 switch (field->type) {
-                        case FIELD_EMPTY:
-                                printf("%*s", width, "");
-                                break;
-                        case FIELD_UINT:
-                                printf("%*" PRIu64, width, field->uint);
-                                break;
-                        case FIELD_UINT_SUFFIX_BIN: {
-                                uint64_t val = field->uint;
-                                const char *suffix;
-                                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;
-                                width -= 1;
-                                order_suffix(val, &val, &suffix);
-                                printf("%*" PRIu64 "%c", width, val, suffix);
-                                break;
-                                }
-                        case FIELD_PERCENT:
-                                width -= 5; /* nnn.% */
-                                if (width > 2) {
-                                        printf("%*s", width - 2, "");
-                                        width = 2;
-                                }
-                                print_percent(field->fixed, width);
-                                break;
-                        case FIELD_STRING:
-                                printf("%-*.*s", width, width, field->string);
-                                break;
+                case FIELD_EMPTY:
+                        printf("%*s", width, "");
+                        break;
+                case FIELD_UINT:
+                        printf("%*" PRIu64, width, field->uint);
+                        break;
+                case FIELD_UINT_SUFFIX_BIN: {
+                        uint64_t val = field->uint;
+                        const char *suffix;
+                        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;
+                        width -= 1;
+                        order_suffix(val, &val, &suffix);
+                        printf("%*" PRIu64 "%c", width, val, suffix);
+                        break;
+                }
+                case FIELD_PERCENT:
+                        width -= 5; /* nnn.% */
+                        if (width > 2) {
+                                printf("%*s", width - 2, "");
+                                width = 2;
+                        }
+                        print_percent(field->fixed, width);
+                        break;
+                case FIELD_STRING:
+                        printf("%-*.*s", width, width, field->string);
+                        break;
                 }
 

uspace/app/top/top.c

@@ -371 +371 @@
 
         switch (fa->type) {
-                case FIELD_EMPTY:
-                        return 0;
-                case FIELD_UINT_SUFFIX_BIN: /* fallthrough */
-                case FIELD_UINT_SUFFIX_DEC: /* fallthrough */
-                case FIELD_UINT:
-                        if (fa->uint > fb->uint)
-                                return 1 * sort_reverse;
-                        if (fa->uint < fb->uint)
-                                return -1 * sort_reverse;
-                        return 0;
-                case FIELD_PERCENT:
-                        if (fa->fixed.upper * fb->fixed.lower
-                            > fb->fixed.upper * fa->fixed.lower)
-                                return 1 * sort_reverse;
-                        if (fa->fixed.upper * fb->fixed.lower
-                            < fb->fixed.upper * fa->fixed.lower)
-                                return -1 * sort_reverse;
-                        return 0;
-                case FIELD_STRING:
-                        return str_cmp(fa->string, fb->string) * sort_reverse;
+        case FIELD_EMPTY:
+                return 0;
+        case FIELD_UINT_SUFFIX_BIN: /* fallthrough */
+        case FIELD_UINT_SUFFIX_DEC: /* fallthrough */
+        case FIELD_UINT:
+                if (fa->uint > fb->uint)
+                        return 1 * sort_reverse;
+                if (fa->uint < fb->uint)
+                        return -1 * sort_reverse;
+                return 0;
+        case FIELD_PERCENT:
+                if (fa->fixed.upper * fb->fixed.lower
+                    > fb->fixed.upper * fa->fixed.lower)
+                        return 1 * sort_reverse;
+                if (fa->fixed.upper * fb->fixed.lower
+                    < fb->fixed.upper * fa->fixed.lower)
+                        return -1 * sort_reverse;
+                return 0;
+        case FIELD_STRING:
+                return str_cmp(fa->string, fb->string) * sort_reverse;
         }
 
@@ -521 +521 @@
 
         switch (op_mode) {
-                case OP_TASKS:
-                        return fill_task_table(data);
-                case OP_IPC:
-                        return fill_ipc_table(data);
-                case OP_EXCS:
-                        return fill_exception_table(data);
+        case OP_TASKS:
+                return fill_task_table(data);
+        case OP_IPC:
+                return fill_ipc_table(data);
+        case OP_EXCS:
+                return fill_exception_table(data);
         }
         return NULL;
@@ -627 +627 @@
 
                 switch (c) {
-                        case -1: /* do nothing */
+                case -1: /* do nothing */
+                        break;
+                case 't':
+                        op_mode = OP_TASKS;
+                        break;
+                case 'i':
+                        op_mode = OP_IPC;
+                        break;
+                case 'e':
+                        op_mode = OP_EXCS;
+                        break;
+                case 's':
+                        screen_mode = SCREEN_SORT;
+                        break;
+                case 'r':
+                        sort_reverse = -sort_reverse;
+                        break;
+                case 'h':
+                case '?':
+                        screen_mode = SCREEN_HELP;
+                        break;
+                case 'q':
+                        goto out;
+                case 'a':
+                        if (op_mode == OP_EXCS) {
+                                excs_all = !excs_all;
+                                if (excs_all)
+                                        show_warning("Showing all exceptions");
+                                else
+                                        show_warning("Showing only hot exceptions");
                                 break;
-                        case 't':
-                                op_mode = OP_TASKS;
-                                break;
-                        case 'i':
-                                op_mode = OP_IPC;
-                                break;
-                        case 'e':
-                                op_mode = OP_EXCS;
-                                break;
-                        case 's':
-                                screen_mode = SCREEN_SORT;
-                                break;
-                        case 'r':
-                                sort_reverse = -sort_reverse;
-                                break;
-                        case 'h':
-                        case '?':
-                                screen_mode = SCREEN_HELP;
-                                break;
-                        case 'q':
-                                goto out;
-                        case 'a':
-                                if (op_mode == OP_EXCS) {
-                                        excs_all = !excs_all;
-                                        if (excs_all)
-                                                show_warning("Showing all exceptions");
-                                        else
-                                                show_warning("Showing only hot exceptions");
-                                        break;
-                                }
-                                /* fallthrough */
-                        default:
-                                show_warning("Unknown command \"%c\", use \"h\" for help", c);
-                                continue; /* don't redraw */
+                        }
+                        /* fallthrough */
+                default:
+                        show_warning("Unknown command \"%c\", use \"h\" for help", c);
+                        continue; /* don't redraw */
                 }