diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-11-08 08:09:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-08 08:09:40 -0500 |
| commit | a809cee58249cc2f42222f1ab5d4746d634c2668 (patch) | |
| tree | 1dbd042bd61e17b01ad12143dfb171ecd4e7dbcd /src/basic/time-util.c | |
| parent | b719b26cb34e8f2ac752ae7dca2c100b656195a4 (diff) | |
| parent | 6e2b4a6994e29544cb25e5387961d8a9dcf65063 (diff) | |
Merge pull request #4612 from keszybz/format-strings
Format string tweaks (and a small fix on 32bit)
Diffstat (limited to 'src/basic/time-util.c')
| -rw-r--r-- | src/basic/time-util.c | 8 |
1 files changed, 4 insertions, 4 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); |