From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 24 Oct 2014 17:10:09 +0000 (+0200)
Subject: time: don't do comparison twice
X-Git-Tag: v217~70
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=bb1fada8cc691821ade680c36dfb2be13e0658d6

time: don't do comparison twice
---

diff --git a/src/shared/time-util.c b/src/shared/time-util.c
index 33d0822f3..d3404afd5 100644
--- a/src/shared/time-util.c
+++ b/src/shared/time-util.c
@@ -296,8 +296,14 @@ char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) {
         assert(buf);
         assert(l > 0);
 
-        if (t == USEC_INFINITY || t <= 0) {
-                strncpy(p, t == USEC_INFINITY ? "infinity" : "0", l);
+        if (t == USEC_INFINITY) {
+                strncpy(p, "infinity", l-1);
+                p[l-1] = 0;
+                return p;
+        }
+
+        if (t <= 0) {
+                strncpy(p, "0", l-1);
                 p[l-1] = 0;
                 return p;
         }