chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
time-util: make sure USEC_PER_SEC and friends are actually of type usec_t
[elogind.git]
/
src
/
shared
/
time-util.c
diff --git
a/src/shared/time-util.c
b/src/shared/time-util.c
index c66763872d77536a83d7c89c41a26153018625aa..8e5de77757fa587a7e3db4db985104e4877b5f18 100644
(file)
--- a/
src/shared/time-util.c
+++ b/
src/shared/time-util.c
@@
-183,7
+183,7
@@
char *format_timestamp_us(char *buf, size_t l, usec_t t) {
if (strftime(buf, l, "%a %Y-%m-%d %H:%M:%S", &tm) <= 0)
return NULL;
if (strftime(buf, l, "%a %Y-%m-%d %H:%M:%S", &tm) <= 0)
return NULL;
- snprintf(buf + strlen(buf), l - strlen(buf), ".%06llu",
t % USEC_PER_SEC
);
+ snprintf(buf + strlen(buf), l - strlen(buf), ".%06llu",
(unsigned long long) (t % USEC_PER_SEC)
);
if (strftime(buf + strlen(buf), l - strlen(buf), " %Z", &tm) <= 0)
return NULL;
if (strftime(buf + strlen(buf), l - strlen(buf), " %Z", &tm) <= 0)
return NULL;
@@
-208,41
+208,41
@@
char *format_timestamp_relative(char *buf, size_t l, usec_t t) {
}
if (d >= USEC_PER_YEAR)
}
if (d >= USEC_PER_YEAR)
- snprintf(buf, l,
"%llu years %llu
months %s",
+ snprintf(buf, l,
USEC_FMT " years " USEC_FMT "
months %s",
d / USEC_PER_YEAR,
(d % USEC_PER_YEAR) / USEC_PER_MONTH, s);
else if (d >= USEC_PER_MONTH)
d / USEC_PER_YEAR,
(d % USEC_PER_YEAR) / USEC_PER_MONTH, s);
else if (d >= USEC_PER_MONTH)
- snprintf(buf, l,
"%llu months %llu
days %s",
+ snprintf(buf, l,
USEC_FMT " months " USEC_FMT "
days %s",
d / USEC_PER_MONTH,
(d % USEC_PER_MONTH) / USEC_PER_DAY, s);
else if (d >= USEC_PER_WEEK)
d / USEC_PER_MONTH,
(d % USEC_PER_MONTH) / USEC_PER_DAY, s);
else if (d >= USEC_PER_WEEK)
- snprintf(buf, l,
"%llu weeks %llu
days %s",
+ snprintf(buf, l,
USEC_FMT " weeks " USEC_FMT "
days %s",
d / USEC_PER_WEEK,
(d % USEC_PER_WEEK) / USEC_PER_DAY, s);
else if (d >= 2*USEC_PER_DAY)
d / USEC_PER_WEEK,
(d % USEC_PER_WEEK) / USEC_PER_DAY, s);
else if (d >= 2*USEC_PER_DAY)
- snprintf(buf, l,
"%llu
days %s", d / USEC_PER_DAY, s);
+ snprintf(buf, l,
USEC_FMT "
days %s", d / USEC_PER_DAY, s);
else if (d >= 25*USEC_PER_HOUR)
else if (d >= 25*USEC_PER_HOUR)
- snprintf(buf, l, "1 day
%llu
h %s",
+ snprintf(buf, l, "1 day
" USEC_FMT "
h %s",
(d - USEC_PER_DAY) / USEC_PER_HOUR, s);
else if (d >= 6*USEC_PER_HOUR)
(d - USEC_PER_DAY) / USEC_PER_HOUR, s);
else if (d >= 6*USEC_PER_HOUR)
- snprintf(buf, l,
"%llu
h %s",
+ snprintf(buf, l,
USEC_FMT "
h %s",
d / USEC_PER_HOUR, s);
else if (d >= USEC_PER_HOUR)
d / USEC_PER_HOUR, s);
else if (d >= USEC_PER_HOUR)
- snprintf(buf, l,
"%lluh %llu
min %s",
+ snprintf(buf, l,
USEC_FMT "h " USEC_FMT "
min %s",
d / USEC_PER_HOUR,
(d % USEC_PER_HOUR) / USEC_PER_MINUTE, s);
else if (d >= 5*USEC_PER_MINUTE)
d / USEC_PER_HOUR,
(d % USEC_PER_HOUR) / USEC_PER_MINUTE, s);
else if (d >= 5*USEC_PER_MINUTE)
- snprintf(buf, l,
"%llu
min %s",
+ snprintf(buf, l,
USEC_FMT "
min %s",
d / USEC_PER_MINUTE, s);
else if (d >= USEC_PER_MINUTE)
d / USEC_PER_MINUTE, s);
else if (d >= USEC_PER_MINUTE)
- snprintf(buf, l,
"%llumin %llu
s %s",
+ snprintf(buf, l,
USEC_FMT "min " USEC_FMT "
s %s",
d / USEC_PER_MINUTE,
(d % USEC_PER_MINUTE) / USEC_PER_SEC, s);
else if (d >= USEC_PER_SEC)
d / USEC_PER_MINUTE,
(d % USEC_PER_MINUTE) / USEC_PER_SEC, s);
else if (d >= USEC_PER_SEC)
- snprintf(buf, l,
"%llu
s %s",
+ snprintf(buf, l,
USEC_FMT "
s %s",
d / USEC_PER_SEC, s);
else if (d >= USEC_PER_MSEC)
d / USEC_PER_SEC, s);
else if (d >= USEC_PER_MSEC)
- snprintf(buf, l,
"%llu
ms %s",
+ snprintf(buf, l,
USEC_FMT "
ms %s",
d / USEC_PER_MSEC, s);
else if (d > 0)
snprintf(buf, l, USEC_FMT"us %s",
d / USEC_PER_MSEC, s);
else if (d > 0)
snprintf(buf, l, USEC_FMT"us %s",