diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-11-07 11:49:25 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-11-07 22:49:09 -0500 |
| commit | 70887c5f2956f2e8c4f58563535049149db98fc2 (patch) | |
| tree | 588c15c0971937cd9353fcae09fd0bcde98a0c55 /src/basic | |
| parent | 5206a724a0a022dab8159a28ddd72d7d30e81c9c (diff) | |
tree-wide: add PRI_[NU]SEC, and use time format strings more
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/time-util.c | 8 | ||||
| -rw-r--r-- | src/basic/time-util.h | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/basic/time-util.c b/src/basic/time-util.c index fedff1362c..cbdfd55ada 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -309,7 +309,7 @@ static char *format_timestamp_internal( if (n + 8 > l) return NULL; /* Microseconds part doesn't fit. */ - sprintf(buf + n, ".%06llu", (unsigned long long) (t % USEC_PER_SEC)); + sprintf(buf + n, ".%06"PRI_USEC, t % USEC_PER_SEC); } /* Append the timezone */ @@ -499,11 +499,11 @@ char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) { if (j > 0) { k = snprintf(p, l, - "%s"USEC_FMT".%0*llu%s", + "%s"USEC_FMT".%0*"PRI_USEC"%s", p > buf ? " " : "", a, j, - (unsigned long long) b, + b, table[i].suffix); t = 0; @@ -1320,7 +1320,7 @@ unsigned long usec_to_jiffies(usec_t u) { r = sysconf(_SC_CLK_TCK); assert(r > 0); - hz = (unsigned long) r; + hz = r; } return DIV_ROUND_UP(u , USEC_PER_SEC / hz); diff --git a/src/basic/time-util.h b/src/basic/time-util.h index 558b0b5b7f..f67a4474ed 100644 --- a/src/basic/time-util.h +++ b/src/basic/time-util.h @@ -29,8 +29,10 @@ typedef uint64_t usec_t; typedef uint64_t nsec_t; -#define NSEC_FMT "%" PRIu64 -#define USEC_FMT "%" PRIu64 +#define PRI_NSEC PRIu64 +#define PRI_USEC PRIu64 +#define NSEC_FMT "%" PRI_NSEC +#define USEC_FMT "%" PRI_USEC #include "macro.h" |