summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-01-06 00:31:38 +0100
committerLennart Poettering <lennart@poettering.net>2015-01-06 03:16:39 +0100
commit17a20d64912e95ea90380381f85e9ef7fd56ff67 (patch)
tree668ab3ba113b42ce404f55b1597a61c9d75b2132
parent13790add4bf648fed816361794d8277a75253410 (diff)
downloadsystemd-17a20d64912e95ea90380381f85e9ef7fd56ff67.tar.gz
systemd-17a20d64912e95ea90380381f85e9ef7fd56ff67.tar.bz2
systemd-17a20d64912e95ea90380381f85e9ef7fd56ff67.zip
machined: simplification
-rw-r--r--src/machine/machine.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/machine/machine.c b/src/machine/machine.c
index b283118796..6c01617cfb 100644
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -202,6 +202,9 @@ int machine_save(Machine *m) {
goto finish;
}
+ free(temp_path);
+ temp_path = NULL;
+
if (m->unit) {
char *sl;
@@ -213,12 +216,11 @@ int machine_save(Machine *m) {
}
finish:
- if (r < 0) {
- if (temp_path)
- unlink(temp_path);
+ if (temp_path)
+ unlink(temp_path);
+ if (r < 0)
log_error_errno(r, "Failed to save machine data %s: %m", m->state_file);
- }
return r;
}