adjust include statements (v2)

Use "#include <somefile.h>" style for external or exported headers only. changes since v1: - adjusted formatting as Stéphane suggested Signed-off-by: S.Çağlar Onur <caglar@10ur.org> Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
lxc · Jan 1, 2014 · f2363e3 · f2363e3
1 parent 23b9d42
commit f2363e3
Show file tree

Hide file tree

Showing 54 changed files with 125 additions and 114 deletions.
diff --git a/src/lua-lxc/core.c b/src/lua-lxc/core.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <libgen.h>
 #include <lxc/lxccontainer.h>
-#include <lxc/commands.h>
+#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
@@ -25,7 +25,7 @@
 #define _attach_h
 
 #include <sys/types.h>
-#include "attach_options.h"
+#include <lxc/attach_options.h>
 
 struct lxc_proc_context_info {
 	char *lsm_label;

diff --git a/src/lxc/bdev.c b/src/lxc/bdev.c
@@ -37,6 +37,7 @@
 #include <libgen.h>
 #include <linux/loop.h>
 #include <dirent.h>
+
 #include "lxc.h"
 #include "config.h"
 #include "conf.h"

diff --git a/src/lxc/cgroup.c b/src/lxc/cgroup.c
@@ -45,10 +45,9 @@
 #include "conf.h"
 #include "utils.h"
 #include "bdev.h"
-
-#include <lxc/log.h>
-#include <lxc/cgroup.h>
-#include <lxc/start.h>
+#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
@@ -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 <lxc/lxc.h>
-#include <lxc/log.h>
+#include "lxc.h"
+#include "log.h"
 
 lxc_log_define(lxc_checkpoint, lxc);
 

diff --git a/src/lxc/commands.c b/src/lxc/commands.c
@@ -33,13 +33,12 @@
 #include <malloc.h>
 #include <stdlib.h>
 
-#include <lxc/log.h>
-#include <lxc/lxc.h>
-#include <lxc/conf.h>
-#include <lxc/start.h>	/* for struct lxc_handler */
-#include <lxc/utils.h>
-#include <lxc/cgroup.h>
-
+#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
@@ -31,9 +31,8 @@
 #include <sys/types.h>
 #include <stdbool.h>
 
-#include <lxc/list.h>
-
-#include <lxc/start.h> /* 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
@@ -41,9 +41,8 @@
 #include "config.h"
 #include "confile.h"
 #include "utils.h"
-
-#include <lxc/log.h>
-#include <lxc/conf.h>
+#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
@@ -22,7 +22,7 @@
  */
 
 #include <stdio.h>
-#include "attach_options.h"
+#include <lxc/attach_options.h>
 
 #ifndef _confile_h
 #define _confile_h

diff --git a/src/lxc/console.c b/src/lxc/console.c
@@ -32,6 +32,7 @@
 #include <termios.h>
 
 #include <lxc/lxccontainer.h>
+
 #include "log.h"
 #include "conf.h"
 #include "config.h"

diff --git a/src/lxc/error.c b/src/lxc/error.c
@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/wait.h>
+
 #include "error.h"
 #include "log.h"
 

diff --git a/src/lxc/freezer.c b/src/lxc/freezer.c
@@ -34,9 +34,8 @@
 #include "error.h"
 #include "state.h"
 #include "monitor.h"
-
-#include <lxc/log.h>
-#include <lxc/cgroup.h>
+#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
@@ -26,6 +26,7 @@
 #include <sys/stat.h>
 #include <sys/mount.h>
 #include <sys/apparmor.h>
+
 #include "log.h"
 #include "lsm/lsm.h"
 

diff --git a/src/lxc/lsm/selinux.c b/src/lxc/lsm/selinux.c
@@ -25,6 +25,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <selinux/selinux.h>
+
 #include "log.h"
 #include "lsm/lsm.h"
 

diff --git a/src/lxc/lxc.h b/src/lxc/lxc.h
@@ -30,7 +30,7 @@ extern "C" {
 #include <stddef.h>
 #include <sys/select.h>
 #include <sys/types.h>
-#include <lxc/state.h>
+#include "state.h"
 
 struct lxc_msg;
 struct lxc_conf;

diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
@@ -26,10 +26,10 @@
 #include <libgen.h>
 #include <sys/types.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
-
 #include <lxc/lxccontainer.h>
+
+#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
@@ -30,10 +30,9 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
-#include <lxc/utils.h>
-
+#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
@@ -27,12 +27,13 @@
 #include <errno.h>
 #include <ctype.h>
 
+#include <lxc/lxccontainer.h>
+
 #include "log.h"
 #include "config.h"
 #include "lxc.h"
 #include "conf.h"
 #include "state.h"
-#include <lxc/lxccontainer.h>
 
 lxc_log_define(lxc_clone, lxc);
 

diff --git a/src/lxc/lxc_config.c b/src/lxc/lxc_config.c
@@ -20,9 +20,11 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
+
 #include <lxc/lxccontainer.h>
 
+#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
@@ -39,6 +39,7 @@
 #include <sys/ioctl.h>
 
 #include <lxc/lxccontainer.h>
+
 #include "error.h"
 #include "lxc.h"
 #include "log.h"

diff --git a/src/lxc/lxc_create.c b/src/lxc/lxc_create.c
@@ -26,10 +26,9 @@
 #include <fcntl.h>
 #include <sys/types.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
-#include <lxc/bdev.h>
-
+#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
@@ -24,9 +24,8 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
-
+#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
@@ -26,10 +26,11 @@
 #include <libgen.h>
 #include <string.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
 #include <lxc/lxccontainer.h>
 
+#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
@@ -29,11 +29,11 @@
 #include <libgen.h>
 #include <sys/types.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
-#include <lxc/utils.h>
 #include <lxc/lxccontainer.h>
 
+#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
@@ -26,6 +26,7 @@
 #include <sys/param.h>
 #include <stdlib.h>
 #include <signal.h>
+
 #include "commands.h"
 #include "arguments.h"
 #include "namespace.h"

diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c
@@ -29,9 +29,9 @@
 #include <sys/types.h>
 #include <errno.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
-#include <lxc/monitor.h>
+#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
@@ -38,11 +38,11 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#include <lxc/af_unix.h>
-#include <lxc/log.h>
-#include <lxc/mainloop.h>
-#include <lxc/monitor.h>
-#include <lxc/utils.h>
+#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
@@ -17,19 +17,18 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <lxc/lxccontainer.h>
-
 #include <stdio.h>
 #include <libgen.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include <fcntl.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
-#include <lxc/bdev.h>
+#include <lxc/lxccontainer.h>
 
+#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
@@ -40,10 +40,11 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
+#include <lxc/lxccontainer.h>
+
 #include "log.h"
 #include "caps.h"
 #include "lxc.h"
-#include <lxc/lxccontainer.h>
 #include "conf.h"
 #include "cgroup.h"
 #include "utils.h"

diff --git a/src/lxc/lxc_stop.c b/src/lxc/lxc_stop.c
@@ -25,10 +25,10 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
-
 #include <lxc/lxccontainer.h>
+
+#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
@@ -25,10 +25,10 @@
 #include <libgen.h>
 #include <sys/types.h>
 
-#include <lxc/lxc.h>
-#include <lxc/log.h>
 #include <lxc/lxccontainer.h>
 
+#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
@@ -45,6 +45,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/sockios.h>
 #include <sys/param.h>
+
 #include "config.h"
 #include "utils.h"
 #include "network.h"

diff --git a/src/lxc/lxc_usernsexec.c b/src/lxc/lxc_usernsexec.c
@@ -38,6 +38,7 @@
 #include <sched.h>
 #include <pwd.h>
 #include <grp.h>
+
 #include "config.h"
 #include "namespace.h"
 #include "utils.h"