Changeset 84439d7 in mainline for uspace/app/top/screen.c

Timestamp:

2010-12-05T09:34:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

75732da

Parents:

56b962d (diff), 35537a7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with development/

File:

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

uspace/app/top/screen.c

@@ -150 +150 @@
         screen_get_pos(&c, &r);
         
-        if (c < cols)
-                printf("%.*s", cols - c - 1, str);
+        if (c < cols) {
+                int pos = cols - c - 1;
+                printf("%.*s", pos, str);
+        }
 }
 
 static inline void print_global_head(data_t *data)
 {
-        printf("top - %02lu:%02lu:%02lu up %u days, %02u:%02u:%02u, load average:",
+        printf("top - %02lu:%02lu:%02lu up "
+            "%" PRIun " days, %02" PRIun ":%02" PRIun ":%02" PRIun ", "
+            "load average:",
             data->hours, data->minutes, data->seconds,
             data->udays, data->uhours, data->uminutes, data->useconds);
@@ -171 +175 @@
 static inline void print_task_summary(data_t *data)
 {
-        printf("tasks: %u total", data->tasks_count);
+        printf("tasks: %zu total", data->tasks_count);
         screen_newline();
 }
@@ -211 +215 @@
         }
         
-        printf("threads: %u total, %u running, %u ready, %u sleeping, %u lingering, "
-            "%u other, %u invalid",
+        printf("threads: %zu total, %zu running, %zu ready, "
+            "%zu sleeping, %zu lingering, %zu other, %zu invalid",
             total, running, ready, sleeping, lingering, other, invalid);
         screen_newline();
@@ -295 +299 @@
                 order_suffix(task->virtmem, &virtmem, &virtmem_suffix);
                 
-                printf("%-8" PRIu64 " %9u %8" PRIu64 "%c ", task->task_id,
+                printf("%-8" PRIu64 " %9zu %8" PRIu64 "%c ", task->task_id,
                     task->threads, virtmem, virtmem_suffix);
                 print_percent(perc->virtmem, 2);