From: Tom Gundersen <teg@jklm.no>
Date: Tue, 30 Sep 2014 09:37:28 +0000 (+0200)
Subject: shared: util - use nicer idiom to silence Coverity
X-Git-Tag: v217~395
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=c6828d2794fcd00b6b0d2a040301c90ad424d14f

shared: util - use nicer idiom to silence Coverity

Suggested by Zbigniew.
---

diff --git a/src/shared/util.c b/src/shared/util.c
index ec33fc126..ebacee55b 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -3272,13 +3272,8 @@ unsigned columns(void) {
 
         c = 0;
         e = getenv("COLUMNS");
-        if (e) {
-                int r;
-
-                r = safe_atoi(e, &c);
-                if (r < 0) {}
-                        /* do nothing, we fall back to c = 0 */
-        }
+        if (e)
+                (void) safe_atoi(e, &c);
 
         if (c <= 0)
                 c = fd_columns(STDOUT_FILENO);