From 3fb0aae0bc37eafe868d28f0f12ee8803d7ad266 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 19 Feb 2014 19:22:13 +0100 Subject: [PATCH] utils: fix nl_msec2str() which always returned '0msec' for whole second durations If the duration was without subsecond part, the function always returned '0msec', instead of giving the time in days, hours, minutes or seconds. Regression introduced by commit b3fb89f445108677d405c62865b25aeea209d10a. Signed-off-by: Thomas Haller Acked-by: Thomas Graf --- lib/utils.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/utils.c b/lib/utils.c index c04d83f..1267e87 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -551,6 +551,11 @@ char * nl_msec2str(uint64_t msec, char *buf, size_t len) static const char *units[5] = {"d", "h", "m", "s", "msec"}; char * const buf_orig = buf; + if (msec == 0) { + snprintf(buf, len, "0msec"); + return buf_orig; + } + #define _SPLIT(idx, unit) if ((split[idx] = msec / unit)) msec %= unit _SPLIT(0, 86400000); /* days */ _SPLIT(1, 3600000); /* hours */ @@ -559,11 +564,6 @@ char * nl_msec2str(uint64_t msec, char *buf, size_t len) #undef _SPLIT split[4] = msec; - if (msec == 0) { - snprintf(buf, len, "0msec"); - return buf_orig; - } - for (i = 0; i < ARRAY_SIZE(split) && len; i++) { int l; if (split[i] == 0)