diff options
Diffstat (limited to 'src/grp-import/systemd-pull')
-rw-r--r-- | src/grp-import/systemd-pull/pull-common.c | 34 | ||||
-rw-r--r-- | src/grp-import/systemd-pull/pull-job.c | 16 | ||||
-rw-r--r-- | src/grp-import/systemd-pull/pull-job.h | 2 | ||||
-rw-r--r-- | src/grp-import/systemd-pull/pull-raw.c | 34 | ||||
-rw-r--r-- | src/grp-import/systemd-pull/pull-raw.h | 2 | ||||
-rw-r--r-- | src/grp-import/systemd-pull/pull-tar.c | 34 | ||||
-rw-r--r-- | src/grp-import/systemd-pull/pull-tar.h | 2 | ||||
-rw-r--r-- | src/grp-import/systemd-pull/pull.c | 14 |
8 files changed, 69 insertions, 69 deletions
diff --git a/src/grp-import/systemd-pull/pull-common.c b/src/grp-import/systemd-pull/pull-common.c index dc4e4667a9..fb167fd93c 100644 --- a/src/grp-import/systemd-pull/pull-common.c +++ b/src/grp-import/systemd-pull/pull-common.c @@ -19,25 +19,25 @@ #include <sys/prctl.h> -#include "alloc-util.h" -#include "btrfs-util.h" -#include "capability-util.h" -#include "copy.h" -#include "dirent-util.h" -#include "escape.h" -#include "fd-util.h" -#include "io-util.h" -#include "path-util.h" -#include "process-util.h" +#include "basic/alloc-util.h" +#include "basic/btrfs-util.h" +#include "basic/capability-util.h" +#include "basic/copy.h" +#include "basic/dirent-util.h" +#include "basic/escape.h" +#include "basic/fd-util.h" +#include "basic/io-util.h" +#include "basic/path-util.h" +#include "basic/process-util.h" #include "pull-common.h" #include "pull-job.h" -#include "rm-rf.h" -#include "signal-util.h" -#include "siphash24.h" -#include "string-util.h" -#include "strv.h" -#include "util.h" -#include "web-util.h" +#include "basic/rm-rf.h" +#include "basic/signal-util.h" +#include "basic/siphash24.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/util.h" +#include "basic/web-util.h" #define FILENAME_ESCAPE "/.#\"\'" #define HASH_URL_THRESHOLD_LENGTH (_POSIX_PATH_MAX - 16) diff --git a/src/grp-import/systemd-pull/pull-job.c b/src/grp-import/systemd-pull/pull-job.c index 6bcf35ef4e..5b5828c4d5 100644 --- a/src/grp-import/systemd-pull/pull-job.c +++ b/src/grp-import/systemd-pull/pull-job.c @@ -19,16 +19,16 @@ #include <sys/xattr.h> -#include "alloc-util.h" -#include "fd-util.h" -#include "hexdecoct.h" -#include "io-util.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" +#include "basic/hexdecoct.h" +#include "basic/io-util.h" #include "machine-pool.h" -#include "parse-util.h" +#include "basic/parse-util.h" #include "pull-job.h" -#include "string-util.h" -#include "strv.h" -#include "xattr-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/xattr-util.h" PullJob* pull_job_unref(PullJob *j) { if (!j) diff --git a/src/grp-import/systemd-pull/pull-job.h b/src/grp-import/systemd-pull/pull-job.h index 3a152a50e3..80d7370ff1 100644 --- a/src/grp-import/systemd-pull/pull-job.h +++ b/src/grp-import/systemd-pull/pull-job.h @@ -23,7 +23,7 @@ #include "curl-util.h" #include "import-compress.h" -#include "macro.h" +#include "basic/macro.h" typedef struct PullJob PullJob; diff --git a/src/grp-import/systemd-pull/pull-raw.c b/src/grp-import/systemd-pull/pull-raw.c index 19155cc53a..9aa631bba7 100644 --- a/src/grp-import/systemd-pull/pull-raw.c +++ b/src/grp-import/systemd-pull/pull-raw.c @@ -23,30 +23,30 @@ #include <systemd/sd-daemon.h> -#include "alloc-util.h" -#include "btrfs-util.h" -#include "chattr-util.h" -#include "copy.h" +#include "basic/alloc-util.h" +#include "basic/btrfs-util.h" +#include "basic/chattr-util.h" +#include "basic/copy.h" #include "curl-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "fs-util.h" -#include "hostname-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/fs-util.h" +#include "basic/hostname-util.h" #include "import-common.h" #include "import-util.h" -#include "macro.h" -#include "mkdir.h" -#include "path-util.h" +#include "basic/macro.h" +#include "basic/mkdir.h" +#include "basic/path-util.h" #include "pull-common.h" #include "pull-job.h" #include "pull-raw.h" #include "qcow2-util.h" -#include "rm-rf.h" -#include "string-util.h" -#include "strv.h" -#include "utf8.h" -#include "util.h" -#include "web-util.h" +#include "basic/rm-rf.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/utf8.h" +#include "basic/util.h" +#include "basic/web-util.h" typedef enum RawProgress { RAW_DOWNLOADING, diff --git a/src/grp-import/systemd-pull/pull-raw.h b/src/grp-import/systemd-pull/pull-raw.h index 6bafa6dafd..16a6344817 100644 --- a/src/grp-import/systemd-pull/pull-raw.h +++ b/src/grp-import/systemd-pull/pull-raw.h @@ -22,7 +22,7 @@ #include <systemd/sd-event.h> #include "import-util.h" -#include "macro.h" +#include "basic/macro.h" typedef struct RawPull RawPull; diff --git a/src/grp-import/systemd-pull/pull-tar.c b/src/grp-import/systemd-pull/pull-tar.c index e0205c3841..31f931da7c 100644 --- a/src/grp-import/systemd-pull/pull-tar.c +++ b/src/grp-import/systemd-pull/pull-tar.c @@ -22,29 +22,29 @@ #include <systemd/sd-daemon.h> -#include "alloc-util.h" -#include "btrfs-util.h" -#include "copy.h" +#include "basic/alloc-util.h" +#include "basic/btrfs-util.h" +#include "basic/copy.h" #include "curl-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "fs-util.h" -#include "hostname-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/fs-util.h" +#include "basic/hostname-util.h" #include "import-common.h" #include "import-util.h" -#include "macro.h" -#include "mkdir.h" -#include "path-util.h" -#include "process-util.h" +#include "basic/macro.h" +#include "basic/mkdir.h" +#include "basic/path-util.h" +#include "basic/process-util.h" #include "pull-common.h" #include "pull-job.h" #include "pull-tar.h" -#include "rm-rf.h" -#include "string-util.h" -#include "strv.h" -#include "utf8.h" -#include "util.h" -#include "web-util.h" +#include "basic/rm-rf.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/utf8.h" +#include "basic/util.h" +#include "basic/web-util.h" typedef enum TarProgress { TAR_DOWNLOADING, diff --git a/src/grp-import/systemd-pull/pull-tar.h b/src/grp-import/systemd-pull/pull-tar.h index 9ff5bd5953..c59b81ea2e 100644 --- a/src/grp-import/systemd-pull/pull-tar.h +++ b/src/grp-import/systemd-pull/pull-tar.h @@ -22,7 +22,7 @@ #include <systemd/sd-event.h> #include "import-util.h" -#include "macro.h" +#include "basic/macro.h" typedef struct TarPull TarPull; diff --git a/src/grp-import/systemd-pull/pull.c b/src/grp-import/systemd-pull/pull.c index 74df24f993..ced1bf6dcb 100644 --- a/src/grp-import/systemd-pull/pull.c +++ b/src/grp-import/systemd-pull/pull.c @@ -21,17 +21,17 @@ #include <systemd/sd-event.h> -#include "alloc-util.h" -#include "hostname-util.h" +#include "basic/alloc-util.h" +#include "basic/hostname-util.h" #include "import-util.h" #include "machine-image.h" -#include "parse-util.h" +#include "basic/parse-util.h" #include "pull-raw.h" #include "pull-tar.h" -#include "signal-util.h" -#include "string-util.h" -#include "verbs.h" -#include "web-util.h" +#include "basic/signal-util.h" +#include "basic/string-util.h" +#include "basic/verbs.h" +#include "basic/web-util.h" static bool arg_force = false; static const char *arg_image_root = "/var/lib/machines"; |