chiark / gitweb /
machined: simplification
authorLennart Poettering <lennart@poettering.net>
Mon, 5 Jan 2015 23:31:38 +0000 (00:31 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 6 Jan 2015 02:16:39 +0000 (03:16 +0100)
src/machine/machine.c

index b2831187965e4a86e843daa56bfe08cdeec34c63..6c01617cfb8852d3ae4fd88fc58d4fe73166f3d7 100644 (file)
@@ -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;
 }