From f2363e38d07db2ad4796b5580b95e3665ed34a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Wed, 25 Dec 2013 14:27:11 -0500 Subject: [PATCH] adjust include statements (v2) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use "#include " style for external or exported headers only. changes since v1: - adjusted formatting as Stéphane suggested Signed-off-by: S.Çağlar Onur Signed-off-by: Serge Hallyn --- src/lua-lxc/core.c | 2 +- src/lxc/attach.h | 2 +- src/lxc/bdev.c | 1 + src/lxc/cgroup.c | 7 +++---- src/lxc/checkpoint.c | 4 ++-- src/lxc/commands.c | 13 ++++++------- src/lxc/conf.h | 5 ++--- src/lxc/confile.c | 5 ++--- src/lxc/confile.h | 2 +- src/lxc/console.c | 1 + src/lxc/error.c | 1 + src/lxc/freezer.c | 5 ++--- src/lxc/lsm/apparmor.c | 1 + src/lxc/lsm/selinux.c | 1 + src/lxc/lxc.h | 2 +- src/lxc/lxc_cgroup.c | 6 +++--- src/lxc/lxc_checkpoint.c | 7 +++---- src/lxc/lxc_clone.c | 3 ++- src/lxc/lxc_config.c | 4 +++- src/lxc/lxc_console.c | 1 + src/lxc/lxc_create.c | 7 +++---- src/lxc/lxc_destroy.c | 5 ++--- src/lxc/lxc_freeze.c | 5 +++-- src/lxc/lxc_info.c | 6 +++--- src/lxc/lxc_kill.c | 1 + src/lxc/lxc_monitor.c | 6 +++--- src/lxc/lxc_monitord.c | 10 +++++----- src/lxc/lxc_snapshot.c | 9 ++++----- src/lxc/lxc_start.c | 3 ++- src/lxc/lxc_stop.c | 6 +++--- src/lxc/lxc_unfreeze.c | 4 ++-- src/lxc/lxc_user_nic.c | 1 + src/lxc/lxc_usernsexec.c | 1 + src/lxc/lxc_wait.c | 5 +++-- src/lxc/lxccontainer.c | 18 ++++++++++-------- src/lxc/lxccontainer.h | 3 ++- src/lxc/lxclock.c | 6 ++++-- src/lxc/monitor.c | 11 +++++------ src/lxc/monitor.h | 2 +- src/lxc/parse.c | 2 +- src/lxc/restart.c | 8 ++++---- src/lxc/seccomp.c | 2 +- src/lxc/start.h | 6 +++--- src/lxc/state.c | 10 +++++----- src/lxc/utils.h | 1 + src/python-lxc/lxc.c | 6 +++--- src/tests/attach.c | 4 ++-- src/tests/cgpath.c | 6 +++--- src/tests/containertests.c | 2 +- src/tests/get_item.c | 2 +- src/tests/getkeys.c | 2 +- src/tests/locktests.c | 2 +- src/tests/reboot.c | 2 +- src/tests/snapshot.c | 2 +- 54 files changed, 125 insertions(+), 114 deletions(-) diff --git a/src/lua-lxc/core.c b/src/lua-lxc/core.c index 8904ffc86..aa5831c4f 100644 --- a/src/lua-lxc/core.c +++ b/src/lua-lxc/core.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include "lxc/commands.h" #if LUA_VERSION_NUM < 502 #define luaL_newlib(L,l) (lua_newtable(L), luaL_register(L,NULL,l)) diff --git a/src/lxc/attach.h b/src/lxc/attach.h index b5f3ea1c3..22e6932b4 100644 --- a/src/lxc/attach.h +++ b/src/lxc/attach.h @@ -25,7 +25,7 @@ #define _attach_h #include -#include "attach_options.h" +#include struct lxc_proc_context_info { char *lsm_label; diff --git a/src/lxc/bdev.c b/src/lxc/bdev.c index b737effce..29e2ad57f 100644 --- a/src/lxc/bdev.c +++ b/src/lxc/bdev.c @@ -37,6 +37,7 @@ #include #include #include + #include "lxc.h" #include "config.h" #include "conf.h" diff --git a/src/lxc/cgroup.c b/src/lxc/cgroup.c index ce6b73961..946ab0eeb 100644 --- a/src/lxc/cgroup.c +++ b/src/lxc/cgroup.c @@ -45,10 +45,9 @@ #include "conf.h" #include "utils.h" #include "bdev.h" - -#include -#include -#include +#include "log.h" +#include "cgroup.h" +#include "start.h" #if IS_BIONIC #include <../include/lxcmntent.h> diff --git a/src/lxc/checkpoint.c b/src/lxc/checkpoint.c index 75834c98f..b50273a84 100644 --- a/src/lxc/checkpoint.c +++ b/src/lxc/checkpoint.c @@ -20,8 +20,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include +#include "lxc.h" +#include "log.h" lxc_log_define(lxc_checkpoint, lxc); diff --git a/src/lxc/commands.c b/src/lxc/commands.c index 19a416f61..73933cab5 100644 --- a/src/lxc/commands.c +++ b/src/lxc/commands.c @@ -33,13 +33,12 @@ #include #include -#include -#include -#include -#include /* for struct lxc_handler */ -#include -#include - +#include "log.h" +#include "lxc.h" +#include "conf.h" +#include "start.h" /* for struct lxc_handler */ +#include "utils.h" +#include "cgroup.h" #include "commands.h" #include "console.h" #include "confile.h" diff --git a/src/lxc/conf.h b/src/lxc/conf.h index ec7629585..9becc6399 100644 --- a/src/lxc/conf.h +++ b/src/lxc/conf.h @@ -31,9 +31,8 @@ #include #include -#include - -#include /* for lxc_handler */ +#include "list.h" +#include "start.h" /* for lxc_handler */ #if HAVE_SCMP_FILTER_CTX typedef void * scmp_filter_ctx; diff --git a/src/lxc/confile.c b/src/lxc/confile.c index c5ec4f3af..ad694e867 100644 --- a/src/lxc/confile.c +++ b/src/lxc/confile.c @@ -41,9 +41,8 @@ #include "config.h" #include "confile.h" #include "utils.h" - -#include -#include +#include "log.h" +#include "conf.h" #include "network.h" #if HAVE_SYS_PERSONALITY_H diff --git a/src/lxc/confile.h b/src/lxc/confile.h index eb7a8c274..a16c9fd5b 100644 --- a/src/lxc/confile.h +++ b/src/lxc/confile.h @@ -22,7 +22,7 @@ */ #include -#include "attach_options.h" +#include #ifndef _confile_h #define _confile_h diff --git a/src/lxc/console.c b/src/lxc/console.c index 86e5e0593..55e895cdf 100644 --- a/src/lxc/console.c +++ b/src/lxc/console.c @@ -32,6 +32,7 @@ #include #include + #include "log.h" #include "conf.h" #include "config.h" diff --git a/src/lxc/error.c b/src/lxc/error.c index 46c34bbc4..f433bf921 100644 --- a/src/lxc/error.c +++ b/src/lxc/error.c @@ -24,6 +24,7 @@ #include #include #include + #include "error.h" #include "log.h" diff --git a/src/lxc/freezer.c b/src/lxc/freezer.c index be97d757e..7b9f45f21 100644 --- a/src/lxc/freezer.c +++ b/src/lxc/freezer.c @@ -34,9 +34,8 @@ #include "error.h" #include "state.h" #include "monitor.h" - -#include -#include +#include "log.h" +#include "cgroup.h" lxc_log_define(lxc_freezer, lxc); diff --git a/src/lxc/lsm/apparmor.c b/src/lxc/lsm/apparmor.c index fdae5e699..be8998770 100644 --- a/src/lxc/lsm/apparmor.c +++ b/src/lxc/lsm/apparmor.c @@ -26,6 +26,7 @@ #include #include #include + #include "log.h" #include "lsm/lsm.h" diff --git a/src/lxc/lsm/selinux.c b/src/lxc/lsm/selinux.c index b1b02530a..11620c99d 100644 --- a/src/lxc/lsm/selinux.c +++ b/src/lxc/lsm/selinux.c @@ -25,6 +25,7 @@ #include #include #include + #include "log.h" #include "lsm/lsm.h" diff --git a/src/lxc/lxc.h b/src/lxc/lxc.h index 84bcc0469..d048cf211 100644 --- a/src/lxc/lxc.h +++ b/src/lxc/lxc.h @@ -30,7 +30,7 @@ extern "C" { #include #include #include -#include +#include "state.h" struct lxc_msg; struct lxc_conf; diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index 7c26fc620..7998f1cca 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -26,10 +26,10 @@ #include #include -#include -#include - #include + +#include "lxc.h" +#include "log.h" #include "arguments.h" lxc_log_define(lxc_cgroup_ui, lxc_cgroup); diff --git a/src/lxc/lxc_checkpoint.c b/src/lxc/lxc_checkpoint.c index f6a031390..7f7d53ed0 100644 --- a/src/lxc/lxc_checkpoint.c +++ b/src/lxc/lxc_checkpoint.c @@ -30,10 +30,9 @@ #include #include -#include -#include -#include - +#include "lxc.h" +#include "log.h" +#include "utils.h" #include "arguments.h" #include "config.h" #include "caps.h" diff --git a/src/lxc/lxc_clone.c b/src/lxc/lxc_clone.c index 7464dcdec..3354809ea 100644 --- a/src/lxc/lxc_clone.c +++ b/src/lxc/lxc_clone.c @@ -27,12 +27,13 @@ #include #include +#include + #include "log.h" #include "config.h" #include "lxc.h" #include "conf.h" #include "state.h" -#include lxc_log_define(lxc_clone, lxc); diff --git a/src/lxc/lxc_config.c b/src/lxc/lxc_config.c index 8a4114d19..f13749890 100644 --- a/src/lxc/lxc_config.c +++ b/src/lxc/lxc_config.c @@ -20,9 +20,11 @@ #include #include -#include "config.h" + #include +#include "config.h" + struct lxc_config_items { char *name; const char *(*fn)(void); diff --git a/src/lxc/lxc_console.c b/src/lxc/lxc_console.c index 5dc3d49a0..e6a5a7ea2 100644 --- a/src/lxc/lxc_console.c +++ b/src/lxc/lxc_console.c @@ -39,6 +39,7 @@ #include #include + #include "error.h" #include "lxc.h" #include "log.h" diff --git a/src/lxc/lxc_create.c b/src/lxc/lxc_create.c index 7399683d7..5ec7fc33b 100644 --- a/src/lxc/lxc_create.c +++ b/src/lxc/lxc_create.c @@ -26,10 +26,9 @@ #include #include -#include -#include -#include - +#include "lxc.h" +#include "log.h" +#include "bdev.h" #include "arguments.h" #include "utils.h" diff --git a/src/lxc/lxc_destroy.c b/src/lxc/lxc_destroy.c index 06d2d0d16..729d35276 100644 --- a/src/lxc/lxc_destroy.c +++ b/src/lxc/lxc_destroy.c @@ -24,9 +24,8 @@ #include #include -#include -#include - +#include "lxc.h" +#include "log.h" #include "arguments.h" #include "utils.h" diff --git a/src/lxc/lxc_freeze.c b/src/lxc/lxc_freeze.c index 9e783bdac..086c81c3b 100644 --- a/src/lxc/lxc_freeze.c +++ b/src/lxc/lxc_freeze.c @@ -26,10 +26,11 @@ #include #include -#include -#include #include +#include "lxc.h" +#include "log.h" + #include "arguments.h" lxc_log_define(lxc_freeze_ui, lxc_cgroup); diff --git a/src/lxc/lxc_info.c b/src/lxc/lxc_info.c index b344dca50..98698818d 100644 --- a/src/lxc/lxc_info.c +++ b/src/lxc/lxc_info.c @@ -29,11 +29,11 @@ #include #include -#include -#include -#include #include +#include "lxc.h" +#include "log.h" +#include "utils.h" #include "commands.h" #include "arguments.h" diff --git a/src/lxc/lxc_kill.c b/src/lxc/lxc_kill.c index 8322b424f..62c76bd46 100644 --- a/src/lxc/lxc_kill.c +++ b/src/lxc/lxc_kill.c @@ -26,6 +26,7 @@ #include #include #include + #include "commands.h" #include "arguments.h" #include "namespace.h" diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index be381b067..52f4c98c3 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -29,9 +29,9 @@ #include #include -#include -#include -#include +#include "lxc.h" +#include "log.h" +#include "monitor.h" #include "arguments.h" lxc_log_define(lxc_monitor_ui, lxc_monitor); diff --git a/src/lxc/lxc_monitord.c b/src/lxc/lxc_monitord.c index fc83f01bf..84e023990 100644 --- a/src/lxc/lxc_monitord.c +++ b/src/lxc/lxc_monitord.c @@ -38,11 +38,11 @@ #include #include -#include -#include -#include -#include -#include +#include "af_unix.h" +#include "log.h" +#include "mainloop.h" +#include "monitor.h" +#include "utils.h" #define CLIENTFDS_CHUNK 64 diff --git a/src/lxc/lxc_snapshot.c b/src/lxc/lxc_snapshot.c index 1de567197..e83f1b2b9 100644 --- a/src/lxc/lxc_snapshot.c +++ b/src/lxc/lxc_snapshot.c @@ -17,8 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include - #include #include #include @@ -26,10 +24,11 @@ #include #include -#include -#include -#include +#include +#include "lxc.h" +#include "log.h" +#include "bdev.h" #include "arguments.h" #include "utils.h" diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c index acf3145ec..e6ca35558 100644 --- a/src/lxc/lxc_start.c +++ b/src/lxc/lxc_start.c @@ -40,10 +40,11 @@ #include #include +#include + #include "log.h" #include "caps.h" #include "lxc.h" -#include #include "conf.h" #include "cgroup.h" #include "utils.h" diff --git a/src/lxc/lxc_stop.c b/src/lxc/lxc_stop.c index 7940053f2..a7f2907dd 100644 --- a/src/lxc/lxc_stop.c +++ b/src/lxc/lxc_stop.c @@ -25,10 +25,10 @@ #include #include -#include -#include - #include + +#include "lxc.h" +#include "log.h" #include "arguments.h" #include "commands.h" #include "utils.h" diff --git a/src/lxc/lxc_unfreeze.c b/src/lxc/lxc_unfreeze.c index e5def1a27..ccabada55 100644 --- a/src/lxc/lxc_unfreeze.c +++ b/src/lxc/lxc_unfreeze.c @@ -25,10 +25,10 @@ #include #include -#include -#include #include +#include "lxc.h" +#include "log.h" #include "arguments.h" lxc_log_define(lxc_unfreeze_ui, lxc_cgroup); diff --git a/src/lxc/lxc_user_nic.c b/src/lxc/lxc_user_nic.c index 16f1495c3..67b1fa854 100644 --- a/src/lxc/lxc_user_nic.c +++ b/src/lxc/lxc_user_nic.c @@ -45,6 +45,7 @@ #include #include #include + #include "config.h" #include "utils.h" #include "network.h" diff --git a/src/lxc/lxc_usernsexec.c b/src/lxc/lxc_usernsexec.c index e36ff3487..f152f91bf 100644 --- a/src/lxc/lxc_usernsexec.c +++ b/src/lxc/lxc_usernsexec.c @@ -38,6 +38,7 @@ #include #include #include + #include "config.h" #include "namespace.h" #include "utils.h" diff --git a/src/lxc/lxc_wait.c b/src/lxc/lxc_wait.c index b00377ccf..269acfdee 100644 --- a/src/lxc/lxc_wait.c +++ b/src/lxc/lxc_wait.c @@ -28,9 +28,10 @@ #include #include -#include -#include #include + +#include "lxc.h" +#include "log.h" #include "arguments.h" lxc_log_define(lxc_wait_ui, lxc_monitor); diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c index e1d004f3f..b62f7ba6e 100644 --- a/src/lxc/lxccontainer.c +++ b/src/lxc/lxccontainer.c @@ -30,26 +30,28 @@ #include #include #include +#include +#include +#include + +#include +#include + #include "config.h" #include "lxc.h" #include "state.h" -#include #include "conf.h" #include "confile.h" #include "console.h" #include "cgroup.h" #include "commands.h" -#include "version.h" #include "log.h" #include "bdev.h" #include "utils.h" #include "attach.h" -#include -#include -#include -#include -#include -#include +#include "utils.h" +#include "monitor.h" +#include "namespace.h" #include "lxclock.h" #if HAVE_IFADDRS_H diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h index 7d1839eaa..f62ff8fd1 100644 --- a/src/lxc/lxccontainer.h +++ b/src/lxc/lxccontainer.h @@ -22,12 +22,13 @@ #ifndef __LXC_CONTAINER_H #define __LXC_CONTAINER_H -#include "attach_options.h" #include #include #include #include +#include + #ifdef __cplusplus extern "C" { #endif diff --git a/src/lxc/lxclock.c b/src/lxc/lxclock.c index 28691b083..b30f4c342 100644 --- a/src/lxc/lxclock.c +++ b/src/lxc/lxclock.c @@ -27,10 +27,12 @@ #include #include #include -#include -#include + #include +#include "utils.h" +#include "log.h" + #ifdef MUTEX_DEBUGGING #include #endif diff --git a/src/lxc/monitor.c b/src/lxc/monitor.c index 7e0a713f7..2cc4831af 100644 --- a/src/lxc/monitor.c +++ b/src/lxc/monitor.c @@ -41,12 +41,11 @@ #include "error.h" #include "af_unix.h" - -#include -#include -#include -#include -#include +#include "log.h" +#include "lxclock.h" +#include "state.h" +#include "monitor.h" +#include "utils.h" lxc_log_define(lxc_monitor, lxc); diff --git a/src/lxc/monitor.h b/src/lxc/monitor.h index 809391993..7e2a468fa 100644 --- a/src/lxc/monitor.h +++ b/src/lxc/monitor.h @@ -26,7 +26,7 @@ #include #include -#include +#include "conf.h" typedef enum { lxc_msg_state, diff --git a/src/lxc/parse.c b/src/lxc/parse.c index ed51d8871..ea13d0645 100644 --- a/src/lxc/parse.c +++ b/src/lxc/parse.c @@ -31,7 +31,7 @@ #include "parse.h" #include "config.h" #include "utils.h" -#include +#include "log.h" lxc_log_define(lxc_parse, lxc); diff --git a/src/lxc/restart.c b/src/lxc/restart.c index 72320740f..8d5b7923e 100644 --- a/src/lxc/restart.c +++ b/src/lxc/restart.c @@ -30,10 +30,10 @@ #include #include -#include -#include /* for struct lxc_handler */ -#include -#include +#include "log.h" +#include "start.h" /* for struct lxc_handler */ +#include "utils.h" +#include "error.h" lxc_log_define(lxc_restart, lxc); diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c index 1abd69711..ab6c85666 100644 --- a/src/lxc/seccomp.c +++ b/src/lxc/seccomp.c @@ -27,9 +27,9 @@ #include #include #include + #include "config.h" #include "lxcseccomp.h" - #include "log.h" lxc_log_define(lxc_seccomp, lxc); diff --git a/src/lxc/start.h b/src/lxc/start.h index c1f790901..ec7f3f6bb 100644 --- a/src/lxc/start.h +++ b/src/lxc/start.h @@ -23,10 +23,10 @@ #ifndef __lxc_state_h #define __lxc_state_h -#include "config.h" - -#include #include + +#include "config.h" +#include "state.h" #include "namespace.h" struct lxc_conf; diff --git a/src/lxc/state.c b/src/lxc/state.c index 398833aa9..411be853c 100644 --- a/src/lxc/state.c +++ b/src/lxc/state.c @@ -32,11 +32,11 @@ #include #include -#include -#include -#include -#include -#include +#include "lxc.h" +#include "log.h" +#include "start.h" +#include "cgroup.h" +#include "monitor.h" #include "commands.h" #include "config.h" diff --git a/src/lxc/utils.h b/src/lxc/utils.h index 844565dfb..253756257 100644 --- a/src/lxc/utils.h +++ b/src/lxc/utils.h @@ -30,6 +30,7 @@ #include #include #include + #include "config.h" /* returns 1 on success, 0 if there were any failures */ diff --git a/src/python-lxc/lxc.c b/src/python-lxc/lxc.c index 0099b98ed..5ee8dd083 100644 --- a/src/python-lxc/lxc.c +++ b/src/python-lxc/lxc.c @@ -25,9 +25,9 @@ #include #include "structmember.h" #include -#include -#include -#include +#include "lxc/utils.h" +#include "lxc/namespace.h" +#include "lxc/confile.h" #include #include diff --git a/src/tests/attach.c b/src/tests/attach.c index 54f899f58..b63c6339c 100644 --- a/src/tests/attach.c +++ b/src/tests/attach.c @@ -20,8 +20,8 @@ */ #include -#include -#include +#include "lxc/utils.h" +#include "lxc/lsm/lsm.h" #include #include diff --git a/src/tests/cgpath.c b/src/tests/cgpath.c index ef192c627..f0e2de84c 100644 --- a/src/tests/cgpath.c +++ b/src/tests/cgpath.c @@ -28,9 +28,9 @@ #include #include #include -#include "../lxc/cgroup.h" -#include "../lxc/lxc.h" -#include "../lxc/commands.h" +#include "lxc/cgroup.h" +#include "lxc/lxc.h" +#include "lxc/commands.h" #define MYNAME "lxctest1" diff --git a/src/tests/containertests.c b/src/tests/containertests.c index e6f05af90..d3742e78c 100644 --- a/src/tests/containertests.c +++ b/src/tests/containertests.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include "lxc/state.h" #define MYNAME "lxctest1" diff --git a/src/tests/get_item.c b/src/tests/get_item.c index 10ab3d108..1e4121717 100644 --- a/src/tests/get_item.c +++ b/src/tests/get_item.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include "lxc/state.h" #define MYNAME "lxctest1" diff --git a/src/tests/getkeys.c b/src/tests/getkeys.c index 5c336db93..ed68440b7 100644 --- a/src/tests/getkeys.c +++ b/src/tests/getkeys.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include "lxc/state.h" #define MYNAME "lxctest1" diff --git a/src/tests/locktests.c b/src/tests/locktests.c index 360851fdf..191414c06 100644 --- a/src/tests/locktests.c +++ b/src/tests/locktests.c @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../lxc/lxclock.h" +#include "lxc/lxclock.h" #include #include #include diff --git a/src/tests/reboot.c b/src/tests/reboot.c index b27d52312..3601e0dba 100644 --- a/src/tests/reboot.c +++ b/src/tests/reboot.c @@ -25,7 +25,7 @@ #include #include -#include +#include "lxc/namespace.h" #include #include diff --git a/src/tests/snapshot.c b/src/tests/snapshot.c index d9fed3632..6e13932ed 100644 --- a/src/tests/snapshot.c +++ b/src/tests/snapshot.c @@ -23,7 +23,7 @@ #include #include #include -#include "../lxc/lxc.h" +#include "lxc/lxc.h" #define MYNAME "snapxxx1" #define RESTNAME "snapxxx2"