Changes in uspace/app/top/screen.c [ffa2c8ef:933cadf] in mainline

File:

• uspace/app/top/screen.c (modified) (2 diffs)

uspace/app/top/screen.c

@@ -254 +254 @@
         uint64_t used;
         uint64_t free;
-        char total_suffix;
-        char unavail_suffix;
-        char used_suffix;
-        char free_suffix;
-        
-        order_suffix(data->physmem->total, &total, &total_suffix);
-        order_suffix(data->physmem->unavail, &unavail, &unavail_suffix);
-        order_suffix(data->physmem->used, &used, &used_suffix);
-        order_suffix(data->physmem->free, &free, &free_suffix);
-        
-        printf("memory: %" PRIu64 "%c total, %" PRIu64 "%c unavail, %"
-            PRIu64 "%c used, %" PRIu64 "%c free", total, total_suffix,
+        const char *total_suffix;
+        const char *unavail_suffix;
+        const char *used_suffix;
+        const char *free_suffix;
+        
+        bin_order_suffix(data->physmem->total, &total, &total_suffix, false);
+        bin_order_suffix(data->physmem->unavail, &unavail, &unavail_suffix, false);
+        bin_order_suffix(data->physmem->used, &used, &used_suffix, false);
+        bin_order_suffix(data->physmem->free, &free, &free_suffix, false);
+        
+        printf("memory: %" PRIu64 "%s total, %" PRIu64 "%s unavail, %"
+            PRIu64 "%s used, %" PRIu64 "%s free", total, total_suffix,
             unavail, unavail_suffix, used, used_suffix, free, free_suffix);
         screen_newline();
@@ -295 +295 @@
                 
                 uint64_t resmem;
-                char resmem_suffix;
-                order_suffix(task->resmem, &resmem, &resmem_suffix);
+                const char *resmem_suffix;
+                bin_order_suffix(task->resmem, &resmem, &resmem_suffix, true);
                 
                 uint64_t virtmem;
-                char virtmem_suffix;
-                order_suffix(task->virtmem, &virtmem, &virtmem_suffix);
-                
-                printf("%-8" PRIu64 " %7zu %9" PRIu64 "%c ",
+                const char *virtmem_suffix;
+                bin_order_suffix(task->virtmem, &virtmem, &virtmem_suffix, true);
+                
+                printf("%-8" PRIu64 " %7zu %7" PRIu64 "%s ",
                     task->task_id, task->threads, resmem, resmem_suffix);
                 print_percent(perc->resmem, 2);
-                printf(" %8" PRIu64 "%c ", virtmem, virtmem_suffix);
+                printf(" %6" PRIu64 "%s ", virtmem, virtmem_suffix);
                 print_percent(perc->virtmem, 2);
                 puts(" ");