diff options
Diffstat (limited to 'src/grp-import')
26 files changed, 169 insertions, 169 deletions
diff --git a/src/grp-import/curl-util.c b/src/grp-import/curl-util.c index 6990c47f48..d6570a3656 100644 --- a/src/grp-import/curl-util.c +++ b/src/grp-import/curl-util.c @@ -17,10 +17,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "curl-util.h" -#include "fd-util.h" -#include "string-util.h" +#include "basic/fd-util.h" +#include "basic/string-util.h" static void curl_glue_check_finished(CurlGlue *g) { CURLMsg *msg; diff --git a/src/grp-import/curl-util.h b/src/grp-import/curl-util.h index 2e71bd3b5d..296b35d09c 100644 --- a/src/grp-import/curl-util.h +++ b/src/grp-import/curl-util.h @@ -24,7 +24,7 @@ #include <systemd/sd-event.h> -#include "hashmap.h" +#include "basic/hashmap.h" typedef struct CurlGlue CurlGlue; diff --git a/src/grp-import/qcow2-util.c b/src/grp-import/qcow2-util.c index ee2121cc36..fa272088d3 100644 --- a/src/grp-import/qcow2-util.c +++ b/src/grp-import/qcow2-util.c @@ -19,11 +19,11 @@ #include <zlib.h> -#include "alloc-util.h" -#include "btrfs-util.h" +#include "basic/alloc-util.h" +#include "basic/btrfs-util.h" #include "qcow2-util.h" -#include "sparse-endian.h" -#include "util.h" +#include "basic/sparse-endian.h" +#include "basic/util.h" #define QCOW2_MAGIC 0x514649fb diff --git a/src/grp-import/systemd-export/export-raw.c b/src/grp-import/systemd-export/export-raw.c index 658f835132..1e3f6e034e 100644 --- a/src/grp-import/systemd-export/export-raw.c +++ b/src/grp-import/systemd-export/export-raw.c @@ -27,16 +27,16 @@ #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 "export-raw.h" -#include "fd-util.h" -#include "fileio.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" #include "import-common.h" -#include "ratelimit.h" -#include "string-util.h" -#include "util.h" +#include "basic/ratelimit.h" +#include "basic/string-util.h" +#include "basic/util.h" #define COPY_BUFFER_SIZE (16*1024) diff --git a/src/grp-import/systemd-export/export-raw.h b/src/grp-import/systemd-export/export-raw.h index c7ac134603..13d7809b9d 100644 --- a/src/grp-import/systemd-export/export-raw.h +++ b/src/grp-import/systemd-export/export-raw.h @@ -22,7 +22,7 @@ #include <systemd/sd-event.h> #include "import-compress.h" -#include "macro.h" +#include "basic/macro.h" typedef struct RawExport RawExport; diff --git a/src/grp-import/systemd-export/export-tar.c b/src/grp-import/systemd-export/export-tar.c index 9c511984c1..9a8d48dc2e 100644 --- a/src/grp-import/systemd-export/export-tar.c +++ b/src/grp-import/systemd-export/export-tar.c @@ -19,16 +19,16 @@ #include <systemd/sd-daemon.h> -#include "alloc-util.h" -#include "btrfs-util.h" +#include "basic/alloc-util.h" +#include "basic/btrfs-util.h" #include "export-tar.h" -#include "fd-util.h" -#include "fileio.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" #include "import-common.h" -#include "process-util.h" -#include "ratelimit.h" -#include "string-util.h" -#include "util.h" +#include "basic/process-util.h" +#include "basic/ratelimit.h" +#include "basic/string-util.h" +#include "basic/util.h" #define COPY_BUFFER_SIZE (16*1024) diff --git a/src/grp-import/systemd-export/export-tar.h b/src/grp-import/systemd-export/export-tar.h index 50206cabb3..0a59033d5b 100644 --- a/src/grp-import/systemd-export/export-tar.h +++ b/src/grp-import/systemd-export/export-tar.h @@ -22,7 +22,7 @@ #include <systemd/sd-event.h> #include "import-compress.h" -#include "macro.h" +#include "basic/macro.h" typedef struct TarExport TarExport; diff --git a/src/grp-import/systemd-export/export.c b/src/grp-import/systemd-export/export.c index 0a5efe5476..4419cedc57 100644 --- a/src/grp-import/systemd-export/export.c +++ b/src/grp-import/systemd-export/export.c @@ -21,17 +21,17 @@ #include <systemd/sd-event.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "export-raw.h" #include "export-tar.h" -#include "fd-util.h" -#include "fs-util.h" -#include "hostname-util.h" +#include "basic/fd-util.h" +#include "basic/fs-util.h" +#include "basic/hostname-util.h" #include "import-util.h" #include "machine-image.h" -#include "signal-util.h" -#include "string-util.h" -#include "verbs.h" +#include "basic/signal-util.h" +#include "basic/string-util.h" +#include "basic/verbs.h" static ImportCompressType arg_compress = IMPORT_COMPRESS_UNKNOWN; diff --git a/src/grp-import/systemd-import/import-common.c b/src/grp-import/systemd-import/import-common.c index 287a3382a1..c2baef83f8 100644 --- a/src/grp-import/systemd-import/import-common.c +++ b/src/grp-import/systemd-import/import-common.c @@ -22,12 +22,12 @@ #include <sys/stat.h> #include <unistd.h> -#include "btrfs-util.h" -#include "capability-util.h" -#include "fd-util.h" +#include "basic/btrfs-util.h" +#include "basic/capability-util.h" +#include "basic/fd-util.h" #include "import-common.h" -#include "signal-util.h" -#include "util.h" +#include "basic/signal-util.h" +#include "basic/util.h" int import_make_read_only_fd(int fd) { int r; diff --git a/src/grp-import/systemd-import/import-compress.c b/src/grp-import/systemd-import/import-compress.c index f1766bbe3b..05643cfbaf 100644 --- a/src/grp-import/systemd-import/import-compress.c +++ b/src/grp-import/systemd-import/import-compress.c @@ -18,8 +18,8 @@ ***/ #include "import-compress.h" -#include "string-table.h" -#include "util.h" +#include "basic/string-table.h" +#include "basic/util.h" void import_compress_free(ImportCompress *c) { assert(c); diff --git a/src/grp-import/systemd-import/import-compress.h b/src/grp-import/systemd-import/import-compress.h index 6b59d0724b..130afb4cd0 100644 --- a/src/grp-import/systemd-import/import-compress.h +++ b/src/grp-import/systemd-import/import-compress.h @@ -24,7 +24,7 @@ #include <sys/types.h> #include <zlib.h> -#include "macro.h" +#include "basic/macro.h" typedef enum ImportCompressType { IMPORT_COMPRESS_UNKNOWN, diff --git a/src/grp-import/systemd-import/import-raw.c b/src/grp-import/systemd-import/import-raw.c index ce37392707..256d140bc8 100644 --- a/src/grp-import/systemd-import/import-raw.c +++ b/src/grp-import/systemd-import/import-raw.c @@ -22,26 +22,26 @@ #include <systemd/sd-daemon.h> #include <systemd/sd-event.h> -#include "alloc-util.h" -#include "btrfs-util.h" -#include "chattr-util.h" -#include "copy.h" -#include "fd-util.h" -#include "fileio.h" -#include "fs-util.h" -#include "hostname-util.h" +#include "basic/alloc-util.h" +#include "basic/btrfs-util.h" +#include "basic/chattr-util.h" +#include "basic/copy.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-compress.h" #include "import-raw.h" -#include "io-util.h" +#include "basic/io-util.h" #include "machine-pool.h" -#include "mkdir.h" -#include "path-util.h" +#include "basic/mkdir.h" +#include "basic/path-util.h" #include "qcow2-util.h" -#include "ratelimit.h" -#include "rm-rf.h" -#include "string-util.h" -#include "util.h" +#include "basic/ratelimit.h" +#include "basic/rm-rf.h" +#include "basic/string-util.h" +#include "basic/util.h" struct RawImport { sd_event *event; diff --git a/src/grp-import/systemd-import/import-raw.h b/src/grp-import/systemd-import/import-raw.h index f0a315c088..90b452e6e0 100644 --- a/src/grp-import/systemd-import/import-raw.h +++ b/src/grp-import/systemd-import/import-raw.h @@ -22,7 +22,7 @@ #include <systemd/sd-event.h> #include "import-util.h" -#include "macro.h" +#include "basic/macro.h" typedef struct RawImport RawImport; diff --git a/src/grp-import/systemd-import/import-tar.c b/src/grp-import/systemd-import/import-tar.c index 016d05e77d..3e76de481b 100644 --- a/src/grp-import/systemd-import/import-tar.c +++ b/src/grp-import/systemd-import/import-tar.c @@ -22,26 +22,26 @@ #include <systemd/sd-daemon.h> #include <systemd/sd-event.h> -#include "alloc-util.h" -#include "btrfs-util.h" -#include "copy.h" -#include "fd-util.h" -#include "fileio.h" -#include "fs-util.h" -#include "hostname-util.h" +#include "basic/alloc-util.h" +#include "basic/btrfs-util.h" +#include "basic/copy.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-compress.h" #include "import-tar.h" -#include "io-util.h" +#include "basic/io-util.h" #include "machine-pool.h" -#include "mkdir.h" -#include "path-util.h" -#include "process-util.h" +#include "basic/mkdir.h" +#include "basic/path-util.h" +#include "basic/process-util.h" #include "qcow2-util.h" -#include "ratelimit.h" -#include "rm-rf.h" -#include "string-util.h" -#include "util.h" +#include "basic/ratelimit.h" +#include "basic/rm-rf.h" +#include "basic/string-util.h" +#include "basic/util.h" struct TarImport { sd_event *event; diff --git a/src/grp-import/systemd-import/import-tar.h b/src/grp-import/systemd-import/import-tar.h index b66b00ddfd..97a2a30e6d 100644 --- a/src/grp-import/systemd-import/import-tar.h +++ b/src/grp-import/systemd-import/import-tar.h @@ -22,7 +22,7 @@ #include <systemd/sd-event.h> #include "import-util.h" -#include "macro.h" +#include "basic/macro.h" typedef struct TarImport TarImport; diff --git a/src/grp-import/systemd-import/import.c b/src/grp-import/systemd-import/import.c index 338847dbc2..6a1f8d8e42 100644 --- a/src/grp-import/systemd-import/import.c +++ b/src/grp-import/systemd-import/import.c @@ -21,17 +21,17 @@ #include <systemd/sd-event.h> -#include "alloc-util.h" -#include "fd-util.h" -#include "fs-util.h" -#include "hostname-util.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" +#include "basic/fs-util.h" +#include "basic/hostname-util.h" #include "import-raw.h" #include "import-tar.h" #include "import-util.h" #include "machine-image.h" -#include "signal-util.h" -#include "string-util.h" -#include "verbs.h" +#include "basic/signal-util.h" +#include "basic/string-util.h" +#include "basic/verbs.h" static bool arg_force = false; static bool arg_read_only = false; diff --git a/src/grp-import/systemd-importd/importd.c b/src/grp-import/systemd-importd/importd.c index e30dfdf805..c03df610b6 100644 --- a/src/grp-import/systemd-importd/importd.c +++ b/src/grp-import/systemd-importd/importd.c @@ -21,27 +21,27 @@ #include <systemd/sd-bus.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "bus-common-errors.h" #include "bus-util.h" -#include "def.h" -#include "fd-util.h" -#include "hostname-util.h" +#include "basic/def.h" +#include "basic/fd-util.h" +#include "basic/hostname-util.h" #include "import-util.h" #include "machine-pool.h" -#include "missing.h" -#include "mkdir.h" -#include "parse-util.h" -#include "path-util.h" -#include "process-util.h" -#include "signal-util.h" -#include "socket-util.h" -#include "string-table.h" -#include "strv.h" -#include "syslog-util.h" -#include "user-util.h" -#include "util.h" -#include "web-util.h" +#include "basic/missing.h" +#include "basic/mkdir.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/process-util.h" +#include "basic/signal-util.h" +#include "basic/socket-util.h" +#include "basic/string-table.h" +#include "basic/strv.h" +#include "basic/syslog-util.h" +#include "basic/user-util.h" +#include "basic/util.h" +#include "basic/web-util.h" typedef struct Transfer Transfer; typedef struct Manager Manager; 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"; diff --git a/src/grp-import/test-qcow2.c b/src/grp-import/test-qcow2.c index b820253d71..0a256d7f41 100644 --- a/src/grp-import/test-qcow2.c +++ b/src/grp-import/test-qcow2.c @@ -17,10 +17,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "fd-util.h" -#include "log.h" +#include "basic/fd-util.h" +#include "basic/log.h" #include "qcow2-util.h" -#include "util.h" +#include "basic/util.h" int main(int argc, char *argv[]) { _cleanup_close_ int sfd = -1, dfd = -1; |