From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 4 Apr 2013 15:06:00 +0000 (+0200)
Subject: util: tweak format_timespan() a bit
X-Git-Tag: v201~70
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7c537b2e2826139bb73c6eee15d46bf9f7e6059f;p=elogind.git

util: tweak format_timespan() a bit

Make sure to always print out at least one valid component instead of
falling back early to 0.
---

diff --git a/src/shared/time-util.c b/src/shared/time-util.c
index b6a2bec15..9ee711a49 100644
--- a/src/shared/time-util.c
+++ b/src/shared/time-util.c
@@ -251,6 +251,12 @@ char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) {
         if (t == (usec_t) -1)
                 return NULL;
 
+        if (t <= 0) {
+                snprintf(p, l, "0");
+                p[l-1] = 0;
+                return p;
+        }
+
         /* The result of this function can be parsed with parse_sec */
 
         for (i = 0; i < ELEMENTSOF(table); i++) {
@@ -259,15 +265,11 @@ char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) {
                 bool done = false;
                 usec_t a, b;
 
-                if (t == 0 || t < accuracy) {
-                        if (!something) {
-                                snprintf(p, l, "0");
-                                p[l-1] = 0;
-                                return p;
-                        }
+                if (t <= 0)
+                        break;
 
+                if (t < accuracy && something)
                         break;
-                }
 
                 if (t < table[i].usec)
                         continue;
@@ -322,7 +324,6 @@ char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) {
                 l -= n;
                 p += n;
 
-
                 something = true;
         }