diff options
Diffstat (limited to 'src/grp-machine/grp-import/systemd-pull')
11 files changed, 81 insertions, 83 deletions
diff --git a/src/grp-machine/grp-import/systemd-pull/curl-util.c b/src/grp-machine/grp-import/systemd-pull/curl-util.c index 9e0d56e5c3..52d0894018 100644 --- a/src/grp-machine/grp-import/systemd-pull/curl-util.c +++ b/src/grp-machine/grp-import/systemd-pull/curl-util.c @@ -17,9 +17,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/string-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/string-util.h" #include "curl-util.h" diff --git a/src/grp-machine/grp-import/systemd-pull/curl-util.h b/src/grp-machine/grp-import/systemd-pull/curl-util.h index 296b35d09c..1619aeb18c 100644 --- a/src/grp-machine/grp-import/systemd-pull/curl-util.h +++ b/src/grp-machine/grp-import/systemd-pull/curl-util.h @@ -24,7 +24,7 @@ #include <systemd/sd-event.h> -#include "basic/hashmap.h" +#include "systemd-basic/hashmap.h" typedef struct CurlGlue CurlGlue; diff --git a/src/grp-machine/grp-import/systemd-pull/pull-common.c b/src/grp-machine/grp-import/systemd-pull/pull-common.c index bd1623e003..9830d8a10f 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-common.c +++ b/src/grp-machine/grp-import/systemd-pull/pull-common.c @@ -19,23 +19,23 @@ #include <sys/prctl.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 "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" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/btrfs-util.h" +#include "systemd-basic/capability-util.h" +#include "systemd-basic/copy.h" +#include "systemd-basic/dirent-util.h" +#include "systemd-basic/escape.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/io-util.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/siphash24.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" +#include "systemd-basic/web-util.h" #include "pull-common.h" #include "pull-job.h" diff --git a/src/grp-machine/grp-import/systemd-pull/pull-common.h b/src/grp-machine/grp-import/systemd-pull/pull-common.h index 96198a695a..1eb8f27fe8 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-common.h +++ b/src/grp-machine/grp-import/systemd-pull/pull-common.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "shared/import-util.h" +#include "systemd-shared/import-util.h" #include "pull-job.h" diff --git a/src/grp-machine/grp-import/systemd-pull/pull-job.c b/src/grp-machine/grp-import/systemd-pull/pull-job.c index 3735304e6d..e51ac6546e 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-job.c +++ b/src/grp-machine/grp-import/systemd-pull/pull-job.c @@ -19,15 +19,15 @@ #include <sys/xattr.h> -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/hexdecoct.h" -#include "basic/io-util.h" -#include "basic/parse-util.h" -#include "basic/string-util.h" -#include "basic/strv.h" -#include "basic/xattr-util.h" -#include "shared/machine-pool.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/hexdecoct.h" +#include "systemd-basic/io-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/xattr-util.h" +#include "systemd-shared/machine-pool.h" #include "pull-job.h" diff --git a/src/grp-machine/grp-import/systemd-pull/pull-job.h b/src/grp-machine/grp-import/systemd-pull/pull-job.h index 296e32bd09..8a99883794 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-job.h +++ b/src/grp-machine/grp-import/systemd-pull/pull-job.h @@ -21,8 +21,8 @@ #include <gcrypt.h> -#include "basic/macro.h" #include "import-compress.h" +#include "systemd-basic/macro.h" #include "curl-util.h" diff --git a/src/grp-machine/grp-import/systemd-pull/pull-raw.c b/src/grp-machine/grp-import/systemd-pull/pull-raw.c index 9602915a1f..0ed1a83fe4 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-raw.c +++ b/src/grp-machine/grp-import/systemd-pull/pull-raw.c @@ -24,26 +24,26 @@ #include <systemd/sd-daemon.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 "basic/macro.h" -#include "basic/mkdir.h" -#include "basic/path-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" #include "import-common.h" #include "qcow2-util.h" -#include "shared/import-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/btrfs-util.h" +#include "systemd-basic/chattr-util.h" +#include "systemd-basic/copy.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/utf8.h" +#include "systemd-basic/util.h" +#include "systemd-basic/web-util.h" +#include "systemd-shared/import-util.h" #include "curl-util.h" #include "pull-common.h" diff --git a/src/grp-machine/grp-import/systemd-pull/pull-raw.h b/src/grp-machine/grp-import/systemd-pull/pull-raw.h index 47ed499c12..0940cff93b 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-raw.h +++ b/src/grp-machine/grp-import/systemd-pull/pull-raw.h @@ -21,11 +21,10 @@ #include <systemd/sd-event.h> -#include "basic/macro.h" -#include "shared/import-util.h" +#include "systemd-basic/macro.h" +#include "systemd-shared/import-util.h" typedef struct RawPull RawPull; - typedef void (*RawPullFinished)(RawPull *pull, int error, void *userdata); int raw_pull_new(RawPull **pull, sd_event *event, const char *image_root, RawPullFinished on_finished, void *userdata); diff --git a/src/grp-machine/grp-import/systemd-pull/pull-tar.c b/src/grp-machine/grp-import/systemd-pull/pull-tar.c index 121ca31dbd..fbc7accaed 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-tar.c +++ b/src/grp-machine/grp-import/systemd-pull/pull-tar.c @@ -22,25 +22,25 @@ #include <systemd/sd-daemon.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 "basic/macro.h" -#include "basic/mkdir.h" -#include "basic/path-util.h" -#include "basic/process-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" #include "import-common.h" -#include "shared/import-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/btrfs-util.h" +#include "systemd-basic/copy.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/fs-util.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/mkdir.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/process-util.h" +#include "systemd-basic/rm-rf.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/utf8.h" +#include "systemd-basic/util.h" +#include "systemd-basic/web-util.h" +#include "systemd-shared/import-util.h" #include "curl-util.h" #include "pull-common.h" diff --git a/src/grp-machine/grp-import/systemd-pull/pull-tar.h b/src/grp-machine/grp-import/systemd-pull/pull-tar.h index a2850fee9e..21d4db5519 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull-tar.h +++ b/src/grp-machine/grp-import/systemd-pull/pull-tar.h @@ -21,11 +21,10 @@ #include <systemd/sd-event.h> -#include "basic/macro.h" -#include "shared/import-util.h" +#include "systemd-basic/macro.h" +#include "systemd-shared/import-util.h" typedef struct TarPull TarPull; - typedef void (*TarPullFinished)(TarPull *pull, int error, void *userdata); int tar_pull_new(TarPull **pull, sd_event *event, const char *image_root, TarPullFinished on_finished, void *userdata); diff --git a/src/grp-machine/grp-import/systemd-pull/pull.c b/src/grp-machine/grp-import/systemd-pull/pull.c index 4153c938d8..a6b5ed47a8 100644 --- a/src/grp-machine/grp-import/systemd-pull/pull.c +++ b/src/grp-machine/grp-import/systemd-pull/pull.c @@ -21,15 +21,15 @@ #include <systemd/sd-event.h> -#include "basic/alloc-util.h" -#include "basic/hostname-util.h" -#include "basic/parse-util.h" -#include "basic/signal-util.h" -#include "basic/string-util.h" -#include "basic/verbs.h" -#include "basic/web-util.h" -#include "shared/import-util.h" -#include "shared/machine-image.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/signal-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/verbs.h" +#include "systemd-basic/web-util.h" +#include "systemd-shared/import-util.h" +#include "systemd-shared/machine-image.h" #include "pull-raw.h" #include "pull-tar.h" |