From 12ae2a33c683a42f3e780f18007d8b1c374539d5 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Fri, 3 Sep 2021 17:05:12 +0200 Subject: [PATCH] tree-wide: fix lxc header inclusion Signed-off-by: Christian Brauner --- src/lxc/attach.h | 4 ++-- src/lxc/cmd/lxc_init.c | 4 ++-- src/lxc/cmd/lxc_monitord.c | 2 +- src/lxc/commands.h | 5 ++++- src/lxc/confile.h | 3 +-- src/lxc/confile_utils.c | 3 ++- src/lxc/criu.h | 2 +- src/lxc/log.c | 3 ++- src/lxc/lxc.h | 4 ++++ src/lxc/lxccontainer.c | 3 ++- src/lxc/lxclock.c | 2 +- src/lxc/seccomp.c | 3 ++- src/lxc/start.c | 3 ++- src/lxc/storage/overlay.c | 3 ++- src/lxc/storage/storage.h | 2 +- src/lxc/terminal.c | 3 ++- src/lxc/tools/arguments.c | 3 +-- src/lxc/tools/arguments.h | 2 +- src/lxc/tools/lxc_attach.c | 2 +- src/lxc/tools/lxc_autostart.c | 2 +- src/lxc/tools/lxc_cgroup.c | 2 +- src/lxc/tools/lxc_checkpoint.c | 2 +- src/lxc/tools/lxc_config.c | 2 +- src/lxc/tools/lxc_console.c | 2 +- src/lxc/tools/lxc_copy.c | 2 +- src/lxc/tools/lxc_create.c | 2 +- src/lxc/tools/lxc_destroy.c | 2 +- src/lxc/tools/lxc_device.c | 2 +- src/lxc/tools/lxc_execute.c | 2 +- src/lxc/tools/lxc_freeze.c | 2 +- src/lxc/tools/lxc_info.c | 2 +- src/lxc/tools/lxc_ls.c | 2 +- src/lxc/tools/lxc_monitor.c | 2 +- src/lxc/tools/lxc_snapshot.c | 2 +- src/lxc/tools/lxc_start.c | 3 +-- src/lxc/tools/lxc_stop.c | 2 +- src/lxc/tools/lxc_top.c | 2 +- src/lxc/tools/lxc_unfreeze.c | 2 +- src/lxc/tools/lxc_wait.c | 2 +- 39 files changed, 54 insertions(+), 43 deletions(-) diff --git a/src/lxc/attach.h b/src/lxc/attach.h index 6556bab40..d9b356bbf 100644 --- a/src/lxc/attach.h +++ b/src/lxc/attach.h @@ -6,8 +6,8 @@ #include #include -#include "lxccontainer.h" -#include "attach_options.h" +#include "lxc.h" + #include "compiler.h" #include "namespace.h" diff --git a/src/lxc/cmd/lxc_init.c b/src/lxc/cmd/lxc_init.c index f8a0bc23d..6491e2406 100644 --- a/src/lxc/cmd/lxc_init.c +++ b/src/lxc/cmd/lxc_init.c @@ -16,8 +16,8 @@ #include #include -#include -#include +#include "lxc.h" +#include "version.h" #include "compiler.h" #include "config.h" diff --git a/src/lxc/cmd/lxc_monitord.c b/src/lxc/cmd/lxc_monitord.c index a18712b64..8f3ef023f 100644 --- a/src/lxc/cmd/lxc_monitord.c +++ b/src/lxc/cmd/lxc_monitord.c @@ -21,7 +21,7 @@ #include #include -#include +#include "lxc.h" #include "af_unix.h" #include "config.h" diff --git a/src/lxc/commands.h b/src/lxc/commands.h index 8d93bbd3a..b4aac93a0 100644 --- a/src/lxc/commands.h +++ b/src/lxc/commands.h @@ -3,14 +3,17 @@ #ifndef __LXC_COMMANDS_H #define __LXC_COMMANDS_H +#include "config.h" + #include #include #include #include +#include "lxc.h" + #include "compiler.h" #include "cgroups/cgroup.h" -#include "lxccontainer.h" #include "macro.h" #include "state.h" diff --git a/src/lxc/confile.h b/src/lxc/confile.h index 73935a858..f085d1e22 100644 --- a/src/lxc/confile.h +++ b/src/lxc/confile.h @@ -6,8 +6,7 @@ #include #include -#include "lxccontainer.h" -#include "attach_options.h" +#include "lxc.h" #include "compiler.h" diff --git a/src/lxc/confile_utils.c b/src/lxc/confile_utils.c index 07aabd2de..ae05ddac3 100644 --- a/src/lxc/confile_utils.c +++ b/src/lxc/confile_utils.c @@ -9,6 +9,8 @@ #include #include +#include "lxc.h" + #include "conf.h" #include "config.h" #include "confile.h" @@ -17,7 +19,6 @@ #include "list.h" #include "lxc.h" #include "log.h" -#include "lxccontainer.h" #include "macro.h" #include "memory_utils.h" #include "network.h" diff --git a/src/lxc/criu.h b/src/lxc/criu.h index 2e0ca7feb..234f79b79 100644 --- a/src/lxc/criu.h +++ b/src/lxc/criu.h @@ -5,7 +5,7 @@ #include -#include +#include "lxc.h" __hidden extern bool __criu_pre_dump(struct lxc_container *c, struct migrate_opts *opts); __hidden extern bool __criu_dump(struct lxc_container *c, struct migrate_opts *opts); diff --git a/src/lxc/log.c b/src/lxc/log.c index 9c5053ec9..781cc2fa5 100644 --- a/src/lxc/log.c +++ b/src/lxc/log.c @@ -18,11 +18,12 @@ #include #include +#include "lxc.h" + #include "caps.h" #include "config.h" #include "file_utils.h" #include "log.h" -#include "lxccontainer.h" #include "memory_utils.h" #include "utils.h" diff --git a/src/lxc/lxc.h b/src/lxc/lxc.h index f688b25c2..9cf8da67a 100644 --- a/src/lxc/lxc.h +++ b/src/lxc/lxc.h @@ -12,6 +12,10 @@ extern "C" { #include #include +#include "attach_options.h" +#include "lxccontainer.h" +#include "version.h" + #include "compiler.h" #include "memory_utils.h" #include "state.h" diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c index 401288986..e51a1c463 100644 --- a/src/lxc/lxccontainer.c +++ b/src/lxc/lxccontainer.c @@ -25,6 +25,8 @@ #include #include +#include "lxc.h" + #include "netns_ifaddrs.h" #include "af_unix.h" #include "api_extensions.h" @@ -42,7 +44,6 @@ #include "initutils.h" #include "log.h" #include "lxc.h" -#include "lxccontainer.h" #include "lxclock.h" #include "memory_utils.h" #include "monitor.h" diff --git a/src/lxc/lxclock.c b/src/lxc/lxclock.c index a6a43cef2..12be6ef00 100644 --- a/src/lxc/lxclock.c +++ b/src/lxc/lxclock.c @@ -12,7 +12,7 @@ #include #include -#include +#include "lxc.h" #include "config.h" #include "log.h" diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c index c2c0928bd..2b9ecaf69 100644 --- a/src/lxc/seccomp.c +++ b/src/lxc/seccomp.c @@ -11,11 +11,12 @@ #include #include +#include "lxc.h" + #include "af_unix.h" #include "commands.h" #include "config.h" #include "log.h" -#include "lxccontainer.h" #include "lxcseccomp.h" #include "mainloop.h" #include "memory_utils.h" diff --git a/src/lxc/start.c b/src/lxc/start.c index 58c4136ea..252fc8a8a 100644 --- a/src/lxc/start.c +++ b/src/lxc/start.c @@ -25,6 +25,8 @@ #include #include +#include "lxc.h" + #include "af_unix.h" #include "attach_options.h" #include "caps.h" @@ -41,7 +43,6 @@ #include "list.h" #include "log.h" #include "lsm/lsm.h" -#include "lxccontainer.h" #include "lxclock.h" #include "lxcseccomp.h" #include "macro.h" diff --git a/src/lxc/storage/overlay.c b/src/lxc/storage/overlay.c index c00ebc344..86c21a96d 100644 --- a/src/lxc/storage/overlay.c +++ b/src/lxc/storage/overlay.c @@ -8,11 +8,12 @@ #include #include +#include "lxc.h" + #include "conf.h" #include "config.h" #include "confile.h" #include "log.h" -#include "lxccontainer.h" #include "macro.h" #include "memory_utils.h" #include "overlay.h" diff --git a/src/lxc/storage/storage.h b/src/lxc/storage/storage.h index 0f14fd260..62ac75e26 100644 --- a/src/lxc/storage/storage.h +++ b/src/lxc/storage/storage.h @@ -6,7 +6,7 @@ #include #include -#include +#include "lxc.h" #if IS_BIONIC #include "lxcmntent.h" diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c index a1f974be0..b86d8c59a 100644 --- a/src/lxc/terminal.c +++ b/src/lxc/terminal.c @@ -5,7 +5,6 @@ #endif #include #include -#include #include #include #include @@ -15,6 +14,8 @@ #include #include +#include "lxc.h" + #include "af_unix.h" #include "caps.h" #include "commands.h" diff --git a/src/lxc/tools/arguments.c b/src/lxc/tools/arguments.c index 9b16a9409..4176db0e7 100644 --- a/src/lxc/tools/arguments.c +++ b/src/lxc/tools/arguments.c @@ -12,8 +12,7 @@ #include #include -#include "lxccontainer.h" -#include "version.h" +#include "lxc.h" #include "arguments.h" #include "initutils.h" diff --git a/src/lxc/tools/arguments.h b/src/lxc/tools/arguments.h index e49913740..0f0875079 100644 --- a/src/lxc/tools/arguments.h +++ b/src/lxc/tools/arguments.h @@ -11,7 +11,7 @@ #include #include -#include "lxccontainer.h" +#include "lxc.h" #include "compiler.h" struct lxc_arguments; diff --git a/src/lxc/tools/lxc_attach.c b/src/lxc/tools/lxc_attach.c index e6b388b20..6a9ac817b 100644 --- a/src/lxc/tools/lxc_attach.c +++ b/src/lxc/tools/lxc_attach.c @@ -15,7 +15,7 @@ #include #include -#include +#include "lxc.h" #include "arguments.h" #include "attach.h" diff --git a/src/lxc/tools/lxc_autostart.c b/src/lxc/tools/lxc_autostart.c index ecede5c34..4a5031810 100644 --- a/src/lxc/tools/lxc_autostart.c +++ b/src/lxc/tools/lxc_autostart.c @@ -8,7 +8,7 @@ #include #include -#include +#include "lxc.h" #include "arguments.h" #include "config.h" diff --git a/src/lxc/tools/lxc_cgroup.c b/src/lxc/tools/lxc_cgroup.c index 17975152d..edfc03c28 100644 --- a/src/lxc/tools/lxc_cgroup.c +++ b/src/lxc/tools/lxc_cgroup.c @@ -10,7 +10,7 @@ #include #include -#include +#include "lxc.h" #include "arguments.h" #include "config.h" diff --git a/src/lxc/tools/lxc_checkpoint.c b/src/lxc/tools/lxc_checkpoint.c index 4fd25f75b..22abf1866 100644 --- a/src/lxc/tools/lxc_checkpoint.c +++ b/src/lxc/tools/lxc_checkpoint.c @@ -10,7 +10,7 @@ #include #include -#include +#include "lxc.h" #include "arguments.h" #include "config.h" diff --git a/src/lxc/tools/lxc_config.c b/src/lxc/tools/lxc_config.c index dda2db6dc..333dde54f 100644 --- a/src/lxc/tools/lxc_config.c +++ b/src/lxc/tools/lxc_config.c @@ -6,7 +6,7 @@ #include #include -#include +#include "lxc.h" #include "config.h" diff --git a/src/lxc/tools/lxc_console.c b/src/lxc/tools/lxc_console.c index 3e35fe4aa..d11827121 100644 --- a/src/lxc/tools/lxc_console.c +++ b/src/lxc/tools/lxc_console.c @@ -17,7 +17,7 @@ #include #include -#include +#include "lxc.h" #include "arguments.h" #include "config.h" diff --git a/src/lxc/tools/lxc_copy.c b/src/lxc/tools/lxc_copy.c index 94b339f63..384a7e3c8 100644 --- a/src/lxc/tools/lxc_copy.c +++ b/src/lxc/tools/lxc_copy.c @@ -18,7 +18,7 @@ #include #include -#include +#include "lxc.h" #include "arguments.h" #include "config.h" diff --git a/src/lxc/tools/lxc_create.c b/src/lxc/tools/lxc_create.c index 368d0d0a5..6af554031 100644 --- a/src/lxc/tools/lxc_create.c +++ b/src/lxc/tools/lxc_create.c @@ -11,7 +11,7 @@ #include #include -#include +#include "lxc.h" #include "arguments.h" #include "config.h" diff --git a/src/lxc/tools/lxc_destroy.c b/src/lxc/tools/lxc_destroy.c index e2e5f9843..581460ae4 100644 --- a/src/lxc/tools/lxc_destroy.c +++ b/src/lxc/tools/lxc_destroy.c @@ -10,7 +10,7 @@ #include #include -#include +#include "lxc.h" #include "arguments.h" #include "log.h" diff --git a/src/lxc/tools/lxc_device.c b/src/lxc/tools/lxc_device.c index 62d5ac86e..ed69cdfd7 100644 --- a/src/lxc/tools/lxc_device.c +++ b/src/lxc/tools/lxc_device.c @@ -10,7 +10,7 @@ #include #include -#include +#include "lxc.h" #include "netns_ifaddrs.h" #include "arguments.h" diff --git a/src/lxc/tools/lxc_execute.c b/src/lxc/tools/lxc_execute.c index 6352114ec..a706d94db 100644 --- a/src/lxc/tools/lxc_execute.c +++ b/src/lxc/tools/lxc_execute.c @@ -14,7 +14,7 @@ #include #include -#include +#include "lxc.h" #include "arguments.h" #include "caps.h" diff --git a/src/lxc/tools/lxc_freeze.c b/src/lxc/tools/lxc_freeze.c index 483d3aca3..cf5ff6162 100644 --- a/src/lxc/tools/lxc_freeze.c +++ b/src/lxc/tools/lxc_freeze.c @@ -9,7 +9,7 @@ #include #include -#include +#include "lxc.h" #include "arguments.h" #include "config.h" diff --git a/src/lxc/tools/lxc_info.c b/src/lxc/tools/lxc_info.c index fda811fd8..12b2562d3 100644 --- a/src/lxc/tools/lxc_info.c +++ b/src/lxc/tools/lxc_info.c @@ -12,7 +12,7 @@ #include #include -#include +#include "lxc.h" #include "arguments.h" #include "config.h" diff --git a/src/lxc/tools/lxc_ls.c b/src/lxc/tools/lxc_ls.c index 562622c4d..cc64f8732 100644 --- a/src/lxc/tools/lxc_ls.c +++ b/src/lxc/tools/lxc_ls.c @@ -19,7 +19,7 @@ #include #include -#include +#include "lxc.h" #include "arguments.h" #include "config.h" diff --git a/src/lxc/tools/lxc_monitor.c b/src/lxc/tools/lxc_monitor.c index 326b8e7e0..2ecc55c43 100644 --- a/src/lxc/tools/lxc_monitor.c +++ b/src/lxc/tools/lxc_monitor.c @@ -23,7 +23,7 @@ #include #include -#include +#include "lxc.h" #include "af_unix.h" #include "arguments.h" diff --git a/src/lxc/tools/lxc_snapshot.c b/src/lxc/tools/lxc_snapshot.c index a3c058abd..a920a595c 100644 --- a/src/lxc/tools/lxc_snapshot.c +++ b/src/lxc/tools/lxc_snapshot.c @@ -12,7 +12,7 @@ #include #include -#include +#include "lxc.h" #include "arguments.h" #include "config.h" diff --git a/src/lxc/tools/lxc_start.c b/src/lxc/tools/lxc_start.c index f3c990783..6d2c0ae25 100644 --- a/src/lxc/tools/lxc_start.c +++ b/src/lxc/tools/lxc_start.c @@ -19,8 +19,7 @@ #include #include -#include "lxccontainer.h" -#include "attach_options.h" +#include "lxc.h" #include "arguments.h" #include "caps.h" diff --git a/src/lxc/tools/lxc_stop.c b/src/lxc/tools/lxc_stop.c index 73ae61766..e3cecb6b2 100644 --- a/src/lxc/tools/lxc_stop.c +++ b/src/lxc/tools/lxc_stop.c @@ -9,7 +9,7 @@ #include #include -#include +#include "lxc.h" #include "arguments.h" #include "config.h" diff --git a/src/lxc/tools/lxc_top.c b/src/lxc/tools/lxc_top.c index 9cf2cbbbd..35fe76b5a 100644 --- a/src/lxc/tools/lxc_top.c +++ b/src/lxc/tools/lxc_top.c @@ -18,7 +18,7 @@ #include #include -#include +#include "lxc.h" #include "arguments.h" #include "config.h" diff --git a/src/lxc/tools/lxc_unfreeze.c b/src/lxc/tools/lxc_unfreeze.c index e8e2f3180..e5b287289 100644 --- a/src/lxc/tools/lxc_unfreeze.c +++ b/src/lxc/tools/lxc_unfreeze.c @@ -9,7 +9,7 @@ #include #include -#include +#include "lxc.h" #include "arguments.h" #include "config.h" diff --git a/src/lxc/tools/lxc_wait.c b/src/lxc/tools/lxc_wait.c index b5ce3e13f..27f8020d7 100644 --- a/src/lxc/tools/lxc_wait.c +++ b/src/lxc/tools/lxc_wait.c @@ -11,7 +11,7 @@ #include #include -#include +#include "lxc.h" #include "arguments.h" #include "config.h" -- 2.39.2