summaryrefslogtreecommitdiff
path: root/src/import
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-10-27 03:01:06 +0100
committerLennart Poettering <lennart@poettering.net>2015-10-27 13:45:53 +0100
commitb5efdb8af40ea759a1ea584c1bc44ecc81dd00ce (patch)
tree8b8b3411e13a6c92d59e1b071b910aa6c44c7495 /src/import
parent7d50b32a129e781401cf897475f388f682de1368 (diff)
util-lib: split out allocation calls into alloc-util.[ch]
Diffstat (limited to 'src/import')
-rw-r--r--src/import/curl-util.c1
-rw-r--r--src/import/export-raw.c1
-rw-r--r--src/import/export-tar.c1
-rw-r--r--src/import/export.c1
-rw-r--r--src/import/import-raw.c1
-rw-r--r--src/import/import-tar.c1
-rw-r--r--src/import/import.c1
-rw-r--r--src/import/importd.c1
-rw-r--r--src/import/pull-common.c1
-rw-r--r--src/import/pull-dkr.c1
-rw-r--r--src/import/pull-job.c1
-rw-r--r--src/import/pull-raw.c1
-rw-r--r--src/import/pull-tar.c1
-rw-r--r--src/import/pull.c1
-rw-r--r--src/import/qcow2-util.c7
15 files changed, 18 insertions, 3 deletions
diff --git a/src/import/curl-util.c b/src/import/curl-util.c
index 455fa1e07d..4278466df1 100644
--- a/src/import/curl-util.c
+++ b/src/import/curl-util.c
@@ -19,6 +19,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "alloc-util.h"
#include "curl-util.h"
#include "fd-util.h"
#include "string-util.h"
diff --git a/src/import/export-raw.c b/src/import/export-raw.c
index 85e781a308..103d45bf21 100644
--- a/src/import/export-raw.c
+++ b/src/import/export-raw.c
@@ -25,6 +25,7 @@
#include "sd-daemon.h"
+#include "alloc-util.h"
#include "btrfs-util.h"
#include "copy.h"
#include "export-raw.h"
diff --git a/src/import/export-tar.c b/src/import/export-tar.c
index 38e659a517..2bbec661e6 100644
--- a/src/import/export-tar.c
+++ b/src/import/export-tar.c
@@ -21,6 +21,7 @@
#include "sd-daemon.h"
+#include "alloc-util.h"
#include "btrfs-util.h"
#include "export-tar.h"
#include "fd-util.h"
diff --git a/src/import/export.c b/src/import/export.c
index 6ff732d73f..2b33d778d3 100644
--- a/src/import/export.c
+++ b/src/import/export.c
@@ -23,6 +23,7 @@
#include "sd-event.h"
+#include "alloc-util.h"
#include "event-util.h"
#include "export-raw.h"
#include "export-tar.h"
diff --git a/src/import/import-raw.c b/src/import/import-raw.c
index 87f4a3935d..2193d1d7f1 100644
--- a/src/import/import-raw.c
+++ b/src/import/import-raw.c
@@ -24,6 +24,7 @@
#include "sd-daemon.h"
#include "sd-event.h"
+#include "alloc-util.h"
#include "btrfs-util.h"
#include "chattr-util.h"
#include "copy.h"
diff --git a/src/import/import-tar.c b/src/import/import-tar.c
index 64eb5ccd83..2ae1d88168 100644
--- a/src/import/import-tar.c
+++ b/src/import/import-tar.c
@@ -24,6 +24,7 @@
#include "sd-daemon.h"
#include "sd-event.h"
+#include "alloc-util.h"
#include "btrfs-util.h"
#include "copy.h"
#include "fd-util.h"
diff --git a/src/import/import.c b/src/import/import.c
index 76b38e4903..018b94d4c4 100644
--- a/src/import/import.c
+++ b/src/import/import.c
@@ -23,6 +23,7 @@
#include "sd-event.h"
+#include "alloc-util.h"
#include "event-util.h"
#include "fd-util.h"
#include "fs-util.h"
diff --git a/src/import/importd.c b/src/import/importd.c
index 65e2354640..4228681cea 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -23,6 +23,7 @@
#include "sd-bus.h"
+#include "alloc-util.h"
#include "bus-common-errors.h"
#include "bus-util.h"
#include "def.h"
diff --git a/src/import/pull-common.c b/src/import/pull-common.c
index c235848821..d6567ba7ee 100644
--- a/src/import/pull-common.c
+++ b/src/import/pull-common.c
@@ -21,6 +21,7 @@
#include <sys/prctl.h>
+#include "alloc-util.h"
#include "btrfs-util.h"
#include "capability-util.h"
#include "copy.h"
diff --git a/src/import/pull-dkr.c b/src/import/pull-dkr.c
index 786651d581..831470ff13 100644
--- a/src/import/pull-dkr.c
+++ b/src/import/pull-dkr.c
@@ -24,6 +24,7 @@
#include "sd-daemon.h"
+#include "alloc-util.h"
#include "aufs-util.h"
#include "btrfs-util.h"
#include "curl-util.h"
diff --git a/src/import/pull-job.c b/src/import/pull-job.c
index 3cc7ea10b7..824fa246ec 100644
--- a/src/import/pull-job.c
+++ b/src/import/pull-job.c
@@ -21,6 +21,7 @@
#include <sys/xattr.h>
+#include "alloc-util.h"
#include "fd-util.h"
#include "hexdecoct.h"
#include "io-util.h"
diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c
index c3476714c8..394131680d 100644
--- a/src/import/pull-raw.c
+++ b/src/import/pull-raw.c
@@ -25,6 +25,7 @@
#include "sd-daemon.h"
+#include "alloc-util.h"
#include "btrfs-util.h"
#include "chattr-util.h"
#include "copy.h"
diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c
index 43b7b65586..26c0bc5866 100644
--- a/src/import/pull-tar.c
+++ b/src/import/pull-tar.c
@@ -24,6 +24,7 @@
#include "sd-daemon.h"
+#include "alloc-util.h"
#include "btrfs-util.h"
#include "copy.h"
#include "curl-util.h"
diff --git a/src/import/pull.c b/src/import/pull.c
index 5e6cd50688..39f5b2d8e4 100644
--- a/src/import/pull.c
+++ b/src/import/pull.c
@@ -23,6 +23,7 @@
#include "sd-event.h"
+#include "alloc-util.h"
#include "event-util.h"
#include "hostname-util.h"
#include "import-util.h"
diff --git a/src/import/qcow2-util.c b/src/import/qcow2-util.c
index fd3cf1b0e3..47dabaa86e 100644
--- a/src/import/qcow2-util.c
+++ b/src/import/qcow2-util.c
@@ -21,10 +21,11 @@
#include <zlib.h>
-#include "util.h"
-#include "sparse-endian.h"
-#include "qcow2-util.h"
+#include "alloc-util.h"
#include "btrfs-util.h"
+#include "qcow2-util.h"
+#include "sparse-endian.h"
+#include "util.h"
#define QCOW2_MAGIC 0x514649fb