util-lib: split out all temporary file related calls into tmpfiles-util.c

This splits out a bunch of functions from fileio.c that have to do with
temporary files. Simply to make the header files a bit shorter, and to
group things more nicely.

No code changes, just some rearranging of source files.

8 files changed, 9 insertions, 7 deletions

diff --git a/src/import/export-raw.c b/src/import/export-raw.c
index 04ad129ca1..6a02b47a17 100644
--- a/src/import/export-raw.c
+++ b/src/import/export-raw.c
@@ -15,13 +15,13 @@
 #include "copy.h"
 #include "export-raw.h"
 #include "fd-util.h"
-#include "fileio.h"
 #include "fs-util.h"
 #include "import-common.h"
 #include "missing.h"
 #include "ratelimit.h"
 #include "stat-util.h"
 #include "string-util.h"
+#include "tmpfile-util.h"
 #include "util.h"
 
 #define COPY_BUFFER_SIZE (16*1024)
diff --git a/src/import/export-tar.c b/src/import/export-tar.c
index 3aab390637..ed546769f3 100644
--- a/src/import/export-tar.c
+++ b/src/import/export-tar.c
@@ -6,11 +6,11 @@
 #include "btrfs-util.h"
 #include "export-tar.h"
 #include "fd-util.h"
-#include "fileio.h"
 #include "import-common.h"
 #include "process-util.h"
 #include "ratelimit.h"
 #include "string-util.h"
+#include "tmpfile-util.h"
 #include "util.h"
 
 #define COPY_BUFFER_SIZE (16*1024)
diff --git a/src/import/import-common.c b/src/import/import-common.c
index 24cab484a2..89f03010d1 100644
--- a/src/import/import-common.c
+++ b/src/import/import-common.c
@@ -16,6 +16,7 @@
 #include "os-util.h"
 #include "process-util.h"
 #include "signal-util.h"
+#include "tmpfile-util.h"
 #include "util.h"
 
 int import_make_read_only_fd(int fd) {
diff --git a/src/import/import-fs.c b/src/import/import-fs.c
index bc2e631e7b..35ba6ba382 100644
--- a/src/import/import-fs.c
+++ b/src/import/import-fs.c
@@ -5,18 +5,18 @@
 #include "alloc-util.h"
 #include "btrfs-util.h"
 #include "fd-util.h"
-#include "fileio.h"
 #include "fs-util.h"
 #include "hostname-util.h"
 #include "import-common.h"
 #include "import-util.h"
 #include "machine-image.h"
 #include "mkdir.h"
+#include "parse-util.h"
 #include "ratelimit.h"
 #include "rm-rf.h"
 #include "string-util.h"
+#include "tmpfile-util.h"
 #include "verbs.h"
-#include "parse-util.h"
 
 static bool arg_force = false;
 static bool arg_read_only = false;
diff --git a/src/import/import-raw.c b/src/import/import-raw.c
index 2b96330c14..4b1161557d 100644
--- a/src/import/import-raw.c
+++ b/src/import/import-raw.c
@@ -10,7 +10,6 @@
 #include "chattr-util.h"
 #include "copy.h"
 #include "fd-util.h"
-#include "fileio.h"
 #include "fs-util.h"
 #include "hostname-util.h"
 #include "import-common.h"
@@ -24,6 +23,7 @@
 #include "ratelimit.h"
 #include "rm-rf.h"
 #include "string-util.h"
+#include "tmpfile-util.h"
 #include "util.h"
 
 struct RawImport {
diff --git a/src/import/import-tar.c b/src/import/import-tar.c
index 0bb086f142..4d0d9254d0 100644
--- a/src/import/import-tar.c
+++ b/src/import/import-tar.c
@@ -24,6 +24,7 @@
 #include "ratelimit.h"
 #include "rm-rf.h"
 #include "string-util.h"
+#include "tmpfile-util.h"
 #include "util.h"
 
 struct TarImport {
diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c
index 39d1747f7d..3a3e015df8 100644
--- a/src/import/pull-raw.c
+++ b/src/import/pull-raw.c
@@ -12,7 +12,6 @@
 #include "copy.h"
 #include "curl-util.h"
 #include "fd-util.h"
-#include "fileio.h"
 #include "fs-util.h"
 #include "hostname-util.h"
 #include "import-common.h"
@@ -27,6 +26,7 @@
 #include "rm-rf.h"
 #include "string-util.h"
 #include "strv.h"
+#include "tmpfile-util.h"
 #include "utf8.h"
 #include "util.h"
 #include "web-util.h"
diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c
index b19d4ea391..e7a208e904 100644
--- a/src/import/pull-tar.c
+++ b/src/import/pull-tar.c
@@ -10,7 +10,6 @@
 #include "copy.h"
 #include "curl-util.h"
 #include "fd-util.h"
-#include "fileio.h"
 #include "fs-util.h"
 #include "hostname-util.h"
 #include "import-common.h"
@@ -25,6 +24,7 @@
 #include "rm-rf.h"
 #include "string-util.h"
 #include "strv.h"
+#include "tmpfile-util.h"
 #include "utf8.h"
 #include "util.h"
 #include "web-util.h"