util-lib: split our string related calls from util.[ch] into its own file string...

[thirdparty/systemd.git] / src / import / import-raw.c

diff --git a/src/import/import-raw.c b/src/import/import-raw.c
index 43cd413042d993c4f5f2e4076692077831f073c2..b13e80584d82d9f9e7f9aa8dafc2da5616247212 100644 (file)
--- a/src/import/import-raw.c
+++ b/src/import/import-raw.c
@@ -23,17 +23,20 @@
 
 #include "sd-daemon.h"
 #include "sd-event.h"
-#include "util.h"
-#include "path-util.h"
+
 #include "btrfs-util.h"
 #include "copy.h"
-#include "mkdir.h"
-#include "rm-rf.h"
-#include "ratelimit.h"
+#include "hostname-util.h"
+#include "import-common.h"
+#include "import-compress.h"
 #include "machine-pool.h"
+#include "mkdir.h"
+#include "path-util.h"
 #include "qcow2-util.h"
-#include "import-compress.h"
-#include "import-common.h"
+#include "ratelimit.h"
+#include "rm-rf.h"
+#include "string-util.h"
+#include "util.h"
 #include "import-raw.h"
 
 struct RawImport {
@@ -248,8 +251,7 @@ static int raw_import_finish(RawImport *i) {
         if (r < 0)
                 return log_error_errno(r, "Failed to move image into place: %m");
 
-        free(i->temp_path);
-        i->temp_path = NULL;
+        i->temp_path = mfree(i->temp_path);
 
         return 0;
 }