service: use free_and_replace() where we can

This commit is contained in:
Lennart Poettering 2018-10-17 20:18:27 +02:00
parent c93d527f46
commit efa3f34e84

View file

@ -2601,10 +2601,10 @@ static int service_deserialize_exec_command(Unit *u, const char *key, const char
_cleanup_free_ char *arg = NULL;
r = extract_first_word(&value, &arg, NULL, EXTRACT_CUNESCAPE);
if (r < 0)
return r;
if (r == 0)
break;
else if (r < 0)
return r;
switch (state) {
case STATE_EXEC_COMMAND_TYPE:
@ -2744,10 +2744,8 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value,
r = cunescape(value, 0, &t);
if (r < 0)
log_unit_debug_errno(u, r, "Failed to unescape status text: %s", value);
else {
free(s->status_text);
s->status_text = t;
}
else
free_and_replace(s->status_text, t);
} else if (streq(key, "accept-socket")) {
Unit *socket;