format_timespan: get rid of usec_t/nsec_t types, use uint64_t instead

Signed-off-by: Arnaud Rebillout <[email protected]>

Author: elboulangero

src/time-util.c

@@ -3,10 +3,10 @@
 #include "util.h"
 #include "time-util.h"
 
-char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) {
+char *format_timespan(char *buf, size_t l, uint64_t t, uint64_t accuracy) {
         static const struct {
                 const char *suffix;
-                usec_t usec;
+                uint64_t usec;
         } table[] = {
                 { "y",     USEC_PER_YEAR   },
                 { "month", USEC_PER_MONTH  },
@@ -44,7 +44,7 @@ char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) {
                 int k = 0;
                 size_t n;
                 bool done = false;
-                usec_t a, b;
+                uint64_t a, b;
 
                 if (t <= 0)
                         break;
@@ -63,7 +63,7 @@ char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) {
 
                 /* Let's see if we should shows this in dot notation */
                 if (t < USEC_PER_MINUTE && b > 0) {
-                        usec_t cc;
+                        uint64_t cc;
                         signed char j;
 
                         j = 0;

src/time-util.h

@@ -3,37 +3,34 @@
 #ifndef footimeutilfoo
 #define footimeutilfoo
 
-typedef uint64_t usec_t;
-typedef uint64_t nsec_t;
-
 #define PRI_NSEC PRIu64
 #define PRI_USEC PRIu64
 #define NSEC_FMT "%" PRI_NSEC
 #define USEC_FMT "%" PRI_USEC
 
-#define USEC_INFINITY ((usec_t) -1)
-#define NSEC_INFINITY ((nsec_t) -1)
+#define USEC_INFINITY ((uint64_t) -1)
+#define NSEC_INFINITY ((uint64_t) -1)
 
 #define MSEC_PER_SEC  1000ULL
-#define USEC_PER_SEC  ((usec_t) 1000000ULL)
-#define USEC_PER_MSEC ((usec_t) 1000ULL)
-//#define NSEC_PER_SEC  ((nsec_t) 1000000000ULL) already defined in util.h
-#define NSEC_PER_MSEC ((nsec_t) 1000000ULL)
-#define NSEC_PER_USEC ((nsec_t) 1000ULL)
-
-#define USEC_PER_MINUTE ((usec_t) (60ULL*USEC_PER_SEC))
-#define NSEC_PER_MINUTE ((nsec_t) (60ULL*NSEC_PER_SEC))
-#define USEC_PER_HOUR ((usec_t) (60ULL*USEC_PER_MINUTE))
-#define NSEC_PER_HOUR ((nsec_t) (60ULL*NSEC_PER_MINUTE))
-#define USEC_PER_DAY ((usec_t) (24ULL*USEC_PER_HOUR))
-#define NSEC_PER_DAY ((nsec_t) (24ULL*NSEC_PER_HOUR))
-#define USEC_PER_WEEK ((usec_t) (7ULL*USEC_PER_DAY))
-#define NSEC_PER_WEEK ((nsec_t) (7ULL*NSEC_PER_DAY))
-#define USEC_PER_MONTH ((usec_t) (2629800ULL*USEC_PER_SEC))
-#define NSEC_PER_MONTH ((nsec_t) (2629800ULL*NSEC_PER_SEC))
-#define USEC_PER_YEAR ((usec_t) (31557600ULL*USEC_PER_SEC))
-#define NSEC_PER_YEAR ((nsec_t) (31557600ULL*NSEC_PER_SEC))
-
-char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy);
+#define USEC_PER_SEC  ((uint64_t) 1000000ULL)
+#define USEC_PER_MSEC ((uint64_t) 1000ULL)
+//#define NSEC_PER_SEC  ((uint64_t) 1000000000ULL) already defined in util.h
+#define NSEC_PER_MSEC ((uint64_t) 1000000ULL)
+#define NSEC_PER_USEC ((uint64_t) 1000ULL)
+
+#define USEC_PER_MINUTE ((uint64_t) (60ULL*USEC_PER_SEC))
+#define NSEC_PER_MINUTE ((uint64_t) (60ULL*NSEC_PER_SEC))
+#define USEC_PER_HOUR ((uint64_t) (60ULL*USEC_PER_MINUTE))
+#define NSEC_PER_HOUR ((uint64_t) (60ULL*NSEC_PER_MINUTE))
+#define USEC_PER_DAY ((uint64_t) (24ULL*USEC_PER_HOUR))
+#define NSEC_PER_DAY ((uint64_t) (24ULL*NSEC_PER_HOUR))
+#define USEC_PER_WEEK ((uint64_t) (7ULL*USEC_PER_DAY))
+#define NSEC_PER_WEEK ((uint64_t) (7ULL*NSEC_PER_DAY))
+#define USEC_PER_MONTH ((uint64_t) (2629800ULL*USEC_PER_SEC))
+#define NSEC_PER_MONTH ((uint64_t) (2629800ULL*NSEC_PER_SEC))
+#define USEC_PER_YEAR ((uint64_t) (31557600ULL*USEC_PER_SEC))
+#define NSEC_PER_YEAR ((uint64_t) (31557600ULL*NSEC_PER_SEC))
+
+char *format_timespan(char *buf, size_t l, uint64_t t, uint64_t accuracy);
 
 #endif