diff options
| author | Jonathan Boulle <jonathanboulle@gmail.com> | 2016-05-19 02:54:22 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-05-18 20:54:22 -0400 |
| commit | 42e1d23f323db01885ddeb97121c4098f0af6700 (patch) | |
| tree | 567b0fcfae47807083f00c44c7e11be29ea6a720 | |
| parent | 4e080f502a5cd6e538a03472070aae8a730c15e9 (diff) | |
| download | systemd-42e1d23f323db01885ddeb97121c4098f0af6700.tar.gz | |
core/dbus: further simplify branch code (#3283)
free_and_strdup already handles the NULL case for us, so we can remove
an extraneous conditional check.
As noted in https://github.com/systemd/systemd/pull/3279/files#r63687717
| -rw-r--r-- | src/core/dbus-execute.c | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index 646bd779a2..04fbc7ad15 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -836,11 +836,9 @@ int bus_exec_context_set_transient_property( return r; if (mode != UNIT_CHECK) { - - if (isempty(uu)) - c->user = mfree(c->user); - else if (free_and_strdup(&c->user, uu) < 0) - return -ENOMEM; + r = free_and_strdup(&c->user, uu); + if (r < 0) + return r; unit_write_drop_in_private_format(u, mode, name, "User=%s\n", uu); } @@ -855,11 +853,9 @@ int bus_exec_context_set_transient_property( return r; if (mode != UNIT_CHECK) { - - if (isempty(gg)) - c->group = mfree(c->group); - else if (free_and_strdup(&c->group, gg) < 0) - return -ENOMEM; + r = free_and_strdup(&c->group, gg); + if (r < 0) + return r; unit_write_drop_in_private_format(u, mode, name, "Group=%s\n", gg); } @@ -873,11 +869,9 @@ int bus_exec_context_set_transient_property( return r; if (mode != UNIT_CHECK) { - - if (isempty(id)) - c->syslog_identifier = mfree(c->syslog_identifier); - else if (free_and_strdup(&c->syslog_identifier, id) < 0) - return -ENOMEM; + r = free_and_strdup(&c->syslog_identifier, id); + if (r < 0) + return r; unit_write_drop_in_private_format(u, mode, name, "SyslogIdentifier=%s\n", id); } @@ -1094,10 +1088,9 @@ int bus_exec_context_set_transient_property( return r; if (mode != UNIT_CHECK) { - if (isempty(id)) - c->utmp_id = mfree(c->utmp_id); - else if (free_and_strdup(&c->utmp_id, id) < 0) - return -ENOMEM; + r = free_and_strdup(&c->utmp_id, id); + if (r < 0) + return r; unit_write_drop_in_private_format(u, mode, name, "UtmpIdentifier=%s\n", strempty(id)); } @@ -1132,10 +1125,9 @@ int bus_exec_context_set_transient_property( return r; if (mode != UNIT_CHECK) { - if (isempty(n)) - c->pam_name = mfree(c->pam_name); - else if (free_and_strdup(&c->pam_name, n) < 0) - return -ENOMEM; + r = free_and_strdup(&c->pam_name, n); + if (r < 0) + return r; unit_write_drop_in_private_format(u, mode, name, "PAMName=%s\n", strempty(n)); } |