From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 15 Dec 2017 15:13:44 +0000 (+0100)
Subject: main: minor optimization
X-Git-Tag: v237~209^2~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4dc63c4bc7850bc570fcf33800a444e09dec81d5;p=thirdparty%2Fsystemd.git

main: minor optimization

Let's remove one memory allocation in the common path.
---

diff --git a/src/core/main.c b/src/core/main.c
index 2ad5073368e..1be7874428f 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1413,6 +1413,7 @@ static int bump_unix_max_dgram_qlen(void) {
 
 static int fixup_environment(void) {
         _cleanup_free_ char *term = NULL;
+        const char *t;
         int r;
 
         /* We expect the environment to be set correctly
@@ -1432,13 +1433,10 @@ static int fixup_environment(void) {
         r = proc_cmdline_get_key("TERM", 0, &term);
         if (r < 0)
                 return r;
-        if (r == 0) {
-                term = strdup(default_term_for_tty("/dev/console"));
-                if (!term)
-                        return -ENOMEM;
-        }
 
-        if (setenv("TERM", term, 1) < 0)
+        t = term ?: default_term_for_tty("/dev/console");
+
+        if (setenv("TERM", t, 1) < 0)
                 return -errno;
 
         return 0;