Changeset 231b3fd in mainline for uspace/app/top/screen.c

Timestamp:

2018-08-25T21:35:26Z (8 years ago)

Author:

GitHub <noreply@…>

Parents:

e2625b1a (diff), 3c45353 (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.

git-author:

Jakub Jermář <jakub@…> (2018-08-25 21:35:26)

git-committer:

GitHub <noreply@…> (2018-08-25 21:35:26)

Message:

Merge 3c453534a2b093c8039d8e8059b923c71f3492a3 into e2625b1a1e5a2895b86f0e39c2d70a39e49e042a

File:

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

uspace/app/top/screen.c

@@ -49 +49 @@
 #include "top.h"
 
-#define USEC_COUNT  1000000
-
-static suseconds_t timeleft = 0;
+static usec_t timeleft = 0;
 
 console_ctrl_t *console;
@@ -57 +55 @@
 static sysarg_t warning_col = 0;
 static sysarg_t warning_row = 0;
-static suseconds_t warning_timeleft = 0;
+static usec_t warning_timeleft = 0;
 static char *warning_text = NULL;
 
@@ -179 +177 @@
 static inline void print_global_head(data_t *data)
 {
-        printf("top - %02lu:%02lu:%02lu up "
+        printf("top - %02lld:%02lld:%02lld up "
             "%" PRIun " days, %02" PRIun ":%02" PRIun ":%02" PRIun ", "
             "load average:",
@@ -527 +525 @@
         va_end(args);
 
-        warning_timeleft = 2 * USEC_COUNT;
+        warning_timeleft = SEC2USEC(2);
 
         screen_moveto(warning_col, warning_row);
@@ -537 +535 @@
  *
  */
-int tgetchar(unsigned int sec)
+int tgetchar(sec_t sec)
 {
         /*
@@ -544 +542 @@
 
         if (timeleft <= 0)
-                timeleft = sec * USEC_COUNT;
+                timeleft = SEC2USEC(sec);
 
         /*