From: Jonathan Boulle <jonathanboulle@gmail.com>
Date: Tue, 17 May 2016 23:30:37 +0000 (+0200)
Subject: core/dbus: use free_and_strdup to simplify code (#3279)
X-Git-Tag: v230~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a363a2e45f67eea5cc0a8fbbfc4a514f1b015cf7;p=thirdparty%2Fsystemd.git

core/dbus: use free_and_strdup to simplify code (#3279)

Makes it consistent with the other branches here.
---

diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index 9dfca14914c..646bd779a2c 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -839,16 +839,8 @@ int bus_exec_context_set_transient_property(
 
                         if (isempty(uu))
                                 c->user = mfree(c->user);
-                        else {
-                                char *t;
-
-                                t = strdup(uu);
-                                if (!t)
-                                        return -ENOMEM;
-
-                                free(c->user);
-                                c->user = t;
-                        }
+                        else if (free_and_strdup(&c->user, uu) < 0)
+                                return -ENOMEM;
 
                         unit_write_drop_in_private_format(u, mode, name, "User=%s\n", uu);
                 }
@@ -866,16 +858,8 @@ int bus_exec_context_set_transient_property(
 
                         if (isempty(gg))
                                 c->group = mfree(c->group);
-                        else {
-                                char *t;
-
-                                t = strdup(gg);
-                                if (!t)
-                                        return -ENOMEM;
-
-                                free(c->group);
-                                c->group = t;
-                        }
+                        else if (free_and_strdup(&c->group, gg) < 0)
+                                return -ENOMEM;
 
                         unit_write_drop_in_private_format(u, mode, name, "Group=%s\n", gg);
                 }
@@ -890,18 +874,10 @@ int bus_exec_context_set_transient_property(
 
                 if (mode != UNIT_CHECK) {
 
-                        if (isempty(id)) {
+                        if (isempty(id))
                                 c->syslog_identifier = mfree(c->syslog_identifier);
-                        } else {
-                                char *t;
-
-                                t = strdup(id);
-                                if (!t)
-                                        return -ENOMEM;
-
-                                free(c->syslog_identifier);
-                                c->syslog_identifier = t;
-                        }
+                        else if (free_and_strdup(&c->syslog_identifier, id) < 0)
+                                return -ENOMEM;
 
                         unit_write_drop_in_private_format(u, mode, name, "SyslogIdentifier=%s\n", id);
                 }