use same ifndef/define format for all headers

Signed-off-by: S.Çağlar Onur <caglar@10ur.org>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>

diff --git a/src/lxc/af_unix.h b/src/lxc/af_unix.h
index 81f2986968f935a86d65e6d9aaccf6ef9f2d4198..3f5d01fe1c55d7629e6c066d72168935826527b2 100644 (file)
--- a/src/lxc/af_unix.h
+++ b/src/lxc/af_unix.h
@@ -21,6 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef __LXC_AF_UNIX_H
+#define __LXC_AF_UNIX_H
+
 extern int lxc_abstract_unix_open(const char *path, int type, int flags);
 extern int lxc_abstract_unix_close(int fd);
 extern int lxc_abstract_unix_connect(const char *path);
@@ -29,3 +32,4 @@ extern int lxc_abstract_unix_recv_fd(int fd, int *recvfd, void *data, size_t siz
 extern int lxc_abstract_unix_send_credential(int fd, void *data, size_t size);
 extern int lxc_abstract_unix_rcv_credential(int fd, void *data, size_t size);
 
+#endif

diff --git a/src/lxc/arguments.h b/src/lxc/arguments.h
index e5f06705a6fc2638ed875934e8d0d02d316895fe..cc85f863f5580400f26354e1e8967bcbe3c1cfd6 100644 (file)
--- a/src/lxc/arguments.h
+++ b/src/lxc/arguments.h
@@ -21,8 +21,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
  */
-#ifndef __arguments_h
-#define __arguments_h
+#ifndef __LXC_ARGUMENTS_H
+#define __LXC_ARGUMENTS_H
 
 #include <getopt.h>
 #include <stdint.h>

diff --git a/src/lxc/attach.h b/src/lxc/attach.h
index 8c833b16fdd4cffa5e625d3a53218ca402dd0e35..0fa0477cce3e95ee136d4ad97a0bcc92e067c732 100644 (file)
--- a/src/lxc/attach.h
+++ b/src/lxc/attach.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _attach_h
-#define _attach_h
+#ifndef __LXC_ATTACH_H
+#define __LXC_ATTACH_H
 
 #include <sys/types.h>
 #include <lxc/attach_options.h>

diff --git a/src/lxc/attach_options.h b/src/lxc/attach_options.h
index c7295fbf7f69757ee7c527adaf26b8e6e6525578..b035318ab0843a702882948a6ba51d19e1bb2250 100644 (file)
--- a/src/lxc/attach_options.h
+++ b/src/lxc/attach_options.h
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _LXC_ATTACH_OPTIONS_H
-#define _LXC_ATTACH_OPTIONS_H
+#ifndef __LXC_ATTACH_OPTIONS_H
+#define __LXC_ATTACH_OPTIONS_H
 
 #include <sys/types.h>
 

diff --git a/src/lxc/caps.h b/src/lxc/caps.h
index 1ea32aed4ee658cb92f4012d7d1c1619bda7c779..daa8b6188d1e0c8fe8cf44f31e5c114c8f0ba16d 100644 (file)
--- a/src/lxc/caps.h
+++ b/src/lxc/caps.h
@@ -22,8 +22,8 @@
  */
 #include "config.h"
 
-#ifndef _caps_h
-#define _caps_h
+#ifndef __LXC_CAPS_H
+#define __LXC_CAPS_H
 
 #if HAVE_SYS_CAPABILITY_H
 extern int lxc_caps_reset(void);

diff --git a/src/lxc/cgroup.h b/src/lxc/cgroup.h
index 3e222a8c151d9cb200414de76522ff62336c9a75..7e033702f9c3c1cf89afe5068a767c91cd7bf9e6 100644 (file)
--- a/src/lxc/cgroup.h
+++ b/src/lxc/cgroup.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef __lxc_cgroup_h
-#define __lxc_cgroup_h
+#ifndef __LXC_CGROUP_H
+#define __LXC_CGROUP_H
 
 #include <stdbool.h>
 #include <stddef.h>

diff --git a/src/lxc/commands.h b/src/lxc/commands.h
index 7829aef22a0962345adcb9d589bd398287ed888c..9efe2ad4304d4af64c0a1551dbc7bba61382781e 100644 (file)
--- a/src/lxc/commands.h
+++ b/src/lxc/commands.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef __commands_h
-#define __commands_h
+#ifndef __LXC_COMMANDS_H
+#define __LXC_COMMANDS_H
 
 #include "state.h"
 

diff --git a/src/lxc/conf.h b/src/lxc/conf.h
index 865b87ac9062f36709135c8dd1d7bba0776fe166..2cfcb7c35ccf97cd556809989613640c9a223020 100644 (file)
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -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
  */
-#ifndef _conf_h
-#define _conf_h
+#ifndef __LXC_CONF_H
+#define __LXC_CONF_H
 
 #include "config.h"
 

diff --git a/src/lxc/confile.h b/src/lxc/confile.h
index 38f04f660467b7ef6ecf7b3c336faa78adb125bf..171614a91ed5e536ee83188b07eef49868c9195c 100644 (file)
--- a/src/lxc/confile.h
+++ b/src/lxc/confile.h
@@ -21,12 +21,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef __LXC_CONFILE_H
+#define __LXC_CONFILE_H
+
 #include <stdio.h>
 #include <lxc/attach_options.h>
 
-#ifndef _confile_h
-#define _confile_h
-
 struct lxc_conf;
 struct lxc_list;
 

diff --git a/src/lxc/console.h b/src/lxc/console.h
index eb3894b34accb719c9feffa5962ae7a272222e24..41d53e62641ec5a5585491bc1b2ae919fd19f693 100644 (file)
--- a/src/lxc/console.h
+++ b/src/lxc/console.h
@@ -21,6 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef __LXC_CONSOLE_H
+#define __LXC_CONSOLE_H
+
 struct lxc_epoll_descr;
 struct lxc_container;
 
@@ -37,3 +40,5 @@ extern int  lxc_console(struct lxc_container *c, int ttynum,
 extern int  lxc_console_getfd(struct lxc_container *c, int *ttynum,
                              int *masterfd);
 extern int  lxc_console_set_stdfds(struct lxc_handler *);
+
+#endif

diff --git a/src/lxc/error.h b/src/lxc/error.h
index 61033d30cd86806a7de823d1b85f173d99b9039a..d5d60de0f0ae6c4960ab0853e3a9f921057ecfc2 100644 (file)
--- a/src/lxc/error.h
+++ b/src/lxc/error.h
@@ -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
  */
-#ifndef __lxc_error_h
-#define __lxc_error_h
+#ifndef __LXC_ERROR_H
+#define __LXC_ERROR_H
 
 extern int  lxc_error_set_and_log(int pid, int status);
 

diff --git a/src/lxc/genl.h b/src/lxc/genl.h
index 20b673b501348b106ef47ad2b99293c14e63fdbc..30806186ff6904059933ff499ef46e9e26b90b5d 100644 (file)
--- a/src/lxc/genl.h
+++ b/src/lxc/genl.h
@@ -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
  */
-#ifndef __genl_h
-#define __genl_h
+#ifndef __LXC_GENL_H
+#define __LXC_GENL_H
 
 /*
  * Use this as a good size to allocate generic netlink messages

diff --git a/src/lxc/list.h b/src/lxc/list.h
index 8714fb3bbade22cc0333828aadd36fbabfaf720d..0882da05ff68f626805a7cb6f78f5a9f115fd837 100644 (file)
--- a/src/lxc/list.h
+++ b/src/lxc/list.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _list_h
-#define _list_h
+#ifndef __LXC_LIST_H
+#define __LXC_LIST_H
 
 struct lxc_list {
        void *elem;

diff --git a/src/lxc/log.h b/src/lxc/log.h
index d9f3ebc2352260196d1fc0508e9eb8efaf7fdc59..b47f1209f97b25ac01f1bc257555aebed147b009 100644 (file)
--- a/src/lxc/log.h
+++ b/src/lxc/log.h
@@ -21,8 +21,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
  */
-#ifndef _log_h
-#define _log_h
+#ifndef __LXC_LOG_H
+#define __LXC_LOG_H
 
 #include "config.h"
 

diff --git a/src/lxc/lxc.h b/src/lxc/lxc.h
index 8775640535e7cf71b22d2f2c66b9a75e14969f4b..e340382eebce31fa42e7afa03d9709a64e66fdc7 100644 (file)
--- a/src/lxc/lxc.h
+++ b/src/lxc/lxc.h
@@ -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
  */
-#ifndef __lxc_h
-#define __lxc_h
+#ifndef __LXC_LXC_H
+#define __LXC_LXC_H
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/lxc/lxclock.h b/src/lxc/lxclock.h
index a02a0320c6da973ffb897a1792d99505a5ef03d3..e00dd8ac36e62127115cdb2b82a9e163440f15bf 100644 (file)
--- a/src/lxc/lxclock.h
+++ b/src/lxc/lxclock.h
@@ -20,8 +20,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __LXCLOCK_H
-#define __LXCLOCK_H
+#ifndef __LXC_LXCLOCK_H
+#define __LXC_LXCLOCK_H
 
 #include <fcntl.h>           /* For O_* constants */
 #include <sys/stat.h>        /* For mode constants */

diff --git a/src/lxc/lxcseccomp.h b/src/lxc/lxcseccomp.h
index 2f64c05dd29103c4949631ab8a8ebe651555aafd..bfafe3aec8dd711cfe508fbf21e0b98e3a3d9d24 100644 (file)
--- a/src/lxc/lxcseccomp.h
+++ b/src/lxc/lxcseccomp.h
@@ -21,7 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _lxc_seccomp_h
+#ifndef __LXC_LXCSECCOMP_H
+#define __LXC_LXCSECCOMP_H
 
 #include "conf.h"
 

diff --git a/src/lxc/lxcutmp.h b/src/lxc/lxcutmp.h
index 81848d12888e813ead2e3eb11bb77a67b5820c3b..062ecdf38eb84601311f8d1ad8c567ff1a7e68f5 100644 (file)
--- a/src/lxc/lxcutmp.h
+++ b/src/lxc/lxcutmp.h
@@ -21,6 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef __LXC_LXCUTMP_H
+#define __LXC_LXCUTMP_H
+
 #include "config.h"
 
 struct lxc_handler;
@@ -28,3 +31,4 @@ struct lxc_epoll_descr;
 
 int lxc_utmp_mainloop_add(struct lxc_epoll_descr *descr,
                          struct lxc_handler *handler);
+#endif

diff --git a/src/lxc/mainloop.h b/src/lxc/mainloop.h
index 21ef577440ef8a3ceee1e1cb0e2afce795f64f64..46a820c6698e82603157ae70245e2ac074b96d14 100644 (file)
--- a/src/lxc/mainloop.h
+++ b/src/lxc/mainloop.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _mainloop_h
-#define _mainloop_h
+#ifndef __LXC_MAINLOOP_H
+#define __LXC_MAINLOOP_H
 
 #include <stdint.h>
 #include "list.h"

diff --git a/src/lxc/monitor.h b/src/lxc/monitor.h
index a7eb11052a8a0499c4c9029f2aeba734bbdbc2a3..229696bd74136ad2265795ee6e2cb09aa8de8ef7 100644 (file)
--- a/src/lxc/monitor.h
+++ b/src/lxc/monitor.h
@@ -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
  */
-#ifndef __monitor_h
-#define __monitor_h
+#ifndef __LXC_MONITOR_H
+#define __LXC_MONITOR_H
 
 #include <limits.h>
 #include <sys/param.h>

diff --git a/src/lxc/namespace.h b/src/lxc/namespace.h
index 64499cd3b8de6ba140757e165fd47aeda93f0018..28f17e687622a0990bb9774f694f85fe5374d55a 100644 (file)
--- a/src/lxc/namespace.h
+++ b/src/lxc/namespace.h
@@ -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
  */
-#ifndef __namespace_h
-#define __namespace_h
+#ifndef __LXC_NAMESPACE_H
+#define __LXC_NAMESPACE_H
 
 #include <sys/syscall.h>
 #include <sched.h>

diff --git a/src/lxc/network.h b/src/lxc/network.h
index 97f6b4d3375c159efbe0d6b7fb4276c80029b3a3..079d52a64a803b35547db53251ced9ed53a0110f 100644 (file)
--- a/src/lxc/network.h
+++ b/src/lxc/network.h
@@ -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
  */
-#ifndef _network_h
-#define _network_h
+#ifndef __LXC_NETWORK_H
+#define __LXC_NETWORK_H
 
 /*
  * Convert a string mac address to a socket structure

diff --git a/src/lxc/nl.h b/src/lxc/nl.h
index 621cbc6c55af69265c4b2815686afb92af4c4cf8..8e737fc8b30cf1ec905a252aca098486659f5c0b 100644 (file)
--- a/src/lxc/nl.h
+++ b/src/lxc/nl.h
@@ -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
  */
-#ifndef __nl_h
-#define __nl_h
+#ifndef __LXC_NL_H
+#define __LXC_NL_H
 
 /*
  * Use this as a good size to allocate generic netlink messages

diff --git a/src/lxc/parse.h b/src/lxc/parse.h
index ba7d639dff34f7938e760b03977513d022d1af9e..8f753198b8fd3ee818646029367f45428d0477ff 100644 (file)
--- a/src/lxc/parse.h
+++ b/src/lxc/parse.h
@@ -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
  */
-#ifndef __parse_h
-#define __parse_h
+#ifndef __LXC_PARSE_H
+#define __LXC_PARSE_H
 
 typedef int (*lxc_dir_cb)(const char *name, const char *directory,
                          const char *file, void *data);

diff --git a/src/lxc/rtnl.h b/src/lxc/rtnl.h
index d13f2b3dd9746bd788d7b914a6cef48f08938f67..d9ad45d71b3ff635c320836609b963471777b766 100644 (file)
--- a/src/lxc/rtnl.h
+++ b/src/lxc/rtnl.h
@@ -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
  */
-#ifndef __genl_h
-#define __genl_h
+#ifndef __LXC_RTNL_H
+#define __LXC_RTNL_H
 
 /*
  * Use this as a good size to allocate route netlink messages

diff --git a/src/lxc/start.h b/src/lxc/start.h
index e2d6bc89573213f0a7e0320201a5be64cb3e07c5..ca7891cdd920f97010ad1683c449e4a9a02b2fef 100644 (file)
--- a/src/lxc/start.h
+++ b/src/lxc/start.h
@@ -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
  */
-#ifndef __lxc_state_h
-#define __lxc_state_h
+#ifndef __LXC_START_H
+#define __LXC_START_H
 
 #include <signal.h>
 #include <sys/param.h>

diff --git a/src/lxc/state.h b/src/lxc/state.h
index bad29430d81825cd969347d6fe47ad2a0264c300..4d26ce6b586d9a6e51ba45d516fa0f47417a3e1c 100644 (file)
--- a/src/lxc/state.h
+++ b/src/lxc/state.h
@@ -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
  */
-#ifndef _state_h
-#define _state_h
+#ifndef __LXC_STATE_H
+#define __LXC_STATE_H
 
 typedef enum {
        STOPPED, STARTING, RUNNING, STOPPING,

diff --git a/src/lxc/sync.h b/src/lxc/sync.h
index fd129af948bd60bfacae889ec766fd80625752a5..930fcb3ea031725745362beb5ea8fdcdc921b7dc 100644 (file)
--- a/src/lxc/sync.h
+++ b/src/lxc/sync.h
@@ -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
  */
-#ifndef __lxc_sync_h
-#define __lxc_sync_h
+#ifndef __LXC_SYNC_H
+#define __LXC_SYNC_H
 
 struct lxc_handler;
 

diff --git a/src/lxc/utils.h b/src/lxc/utils.h
index b5e054cca30ea5bcec9198a3ef9fd7ac60190d99..f48f4033089dfffe1592c3bbd6d0dd8dcb7555ae 100644 (file)
--- a/src/lxc/utils.h
+++ b/src/lxc/utils.h
@@ -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
  */
-#ifndef _utils_h
-#define _utils_h
+#ifndef __LXC_UTILS_H
+#define __LXC_UTILS_H
 
 #include <errno.h>
 #include <stdarg.h>

diff --git a/src/lxc/version.h.in b/src/lxc/version.h.in
index eb9f103536d271fb178fba8fce8951d4d7c14e1c..803a46e46e28a504cd6ab9e73846c5cdcd3970f7 100644 (file)
--- a/src/lxc/version.h.in
+++ b/src/lxc/version.h.in
@@ -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
  */
-#ifndef _VERSION_H
-#define _VERSION_H
+#ifndef __LXC_VERSION_H
+#define __LXC_VERSION_H
 
 #define LXC_VERSION_MAJOR @LXC_VERSION_MAJOR@
 #define LXC_VERSION_MINOR @LXC_VERSION_MINOR@