From: 0xAX <0xAX@users.noreply.github.com>
Date: Mon, 10 Oct 2016 20:11:36 +0000 (+0300)
Subject: main: use strdup instead of free_and_strdup to initialize default unit (#4335)
X-Git-Tag: v232~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6dd106c73abb33af5eb0aaeffcddd11724515e6;p=thirdparty%2Fsystemd.git

main: use strdup instead of free_and_strdup to initialize default unit (#4335)

Previously we've used free_and_strdup() to fill arg_default_unit with unit
name, If we didn't pass default unit name through a kernel command line or
command line arguments. But we can use just strdup() instead of
free_and_strdup() for this, because we will start fill arg_default_unit
only if it wasn't set before.
---

diff --git a/src/core/main.c b/src/core/main.c
index 30d9c43fbb3..9985510161e 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1586,9 +1586,9 @@ int main(int argc, char *argv[]) {
 
         /* Initialize default unit */
         if (!arg_default_unit) {
-                r = free_and_strdup(&arg_default_unit, SPECIAL_DEFAULT_TARGET);
-                if (r < 0) {
-                        log_emergency_errno(r, "Failed to set default unit %s: %m", SPECIAL_DEFAULT_TARGET);
+                arg_default_unit = strdup(SPECIAL_DEFAULT_TARGET);
+                if (!arg_default_unit) {
+                        r = log_oom();
                         error_message = "Failed to set default unit";
                         goto finish;
                 }