Correct (non-resrved) header guards

diff --git a/Makefile b/Makefile
index cd5a64fd94d6933518dfabda319acc7db250fd2c..8f3439bc9e0b6e656ec66f87b516fa350f96e7d5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,21 @@ cmdline.o: cmdline.h common.h log.h util.h
 contain.o: contain.h common.h log.h mount.h net.h util.h uts.h
 log.o: log.h common.h
 mount.o: mount.h common.h log.h
-net.o: net.h common.h log.h
+net.o: net.h common.h log.h /usr/include/libnl3/netlink/route/link.h
+net.o: /usr/include/libnl3/netlink/netlink.h
+net.o: /usr/include/libnl3/netlink/netlink-compat.h
+net.o: /usr/include/libnl3/netlink/version.h
+net.o: /usr/include/libnl3/netlink/errno.h
+net.o: /usr/include/libnl3/netlink/types.h
+net.o: /usr/include/libnl3/netlink/handlers.h
+net.o: /usr/include/libnl3/netlink/netlink-kernel.h
+net.o: /usr/include/libnl3/netlink/socket.h
+net.o: /usr/include/libnl3/netlink/object.h
+net.o: /usr/include/libnl3/netlink/utils.h /usr/include/libnl3/netlink/list.h
+net.o: /usr/include/libnl3/netlink/cache.h /usr/include/libnl3/netlink/msg.h
+net.o: /usr/include/libnl3/netlink/attr.h /usr/include/libnl3/netlink/addr.h
+net.o: /usr/include/libnl3/netlink/data.h
+net.o: /usr/include/libnl3/netlink/route/link/macvlan.h
 sandbox.o: sandbox.h common.h log.h seccomp/bpf-helper.h
 subproc.o: subproc.h common.h contain.h log.h net.h sandbox.h user.h util.h
 user.o: user.h common.h log.h util.h

diff --git a/cmdline.h b/cmdline.h
index 2cd4dc778ac691a354aa8adaa63e90cc0ec24dca..706811ce6c141ccd6f77bf607dc927253ab0ebe6 100644 (file)
--- a/cmdline.h
+++ b/cmdline.h
@@ -19,8 +19,8 @@
 
 */
 
-#ifndef _CMDLINE_H
-#define _CMDLINE_H
+#ifndef NS_CMDLINE_H
+#define NS_CMDLINE_H
 
 #include <sys/time.h>
 #include <sys/resource.h>

diff --git a/common.h b/common.h
index 8165c0a14ef80e370909886f6bb4cae0648f9394..3c3e396510b447b495d677fdfd1e5e024ed6483d 100644 (file)
--- a/common.h
+++ b/common.h
@@ -19,8 +19,8 @@
 
 */
 
-#ifndef _COMMON_H
-#define _COMMON_H
+#ifndef NS_COMMON_H
+#define NS_COMMON_H
 
 #include <limits.h>
 #include <netinet/ip6.h>
@@ -38,7 +38,7 @@
 #ifdef __clang__
 static void __attribute__ ((unused)) _clang_cleanup_func(void (^*dfunc) (void))
 {
-    (*dfunc) ();
+       (*dfunc) ();
 }
 
 #define DEFER(a) void (^_STRMERGE(__defer_f_, __COUNTER__))(void) __attribute__((cleanup(_clang_cleanup_func))) __attribute__((unused)) = ^{ a; }
@@ -126,4 +126,4 @@ struct nsjconf_t {
         TAILQ_HEAD(mountptslist, mounts_t) mountpts;
 };
 
-#endif                         /* _COMMON_H */
+#endif                         /* NS_COMMON_H */

diff --git a/contain.h b/contain.h
index 4a57da923678f4e5d78d53cfbde1940309fb67c9..1ea0e9946f5b673fda45d7e9c049873bf01e4335 100644 (file)
--- a/contain.h
+++ b/contain.h
@@ -19,8 +19,8 @@
 
 */
 
-#ifndef _CONTAIN_H
-#define _CONTAIN_H
+#ifndef NS_CONTAIN_H
+#define NS_CONTAIN_H
 
 #include <stdbool.h>
 
@@ -29,4 +29,4 @@
 bool containSetupFD(struct nsjconf_t *nsjconf, int fd_in, int fd_out, int fd_err, int fd_log);
 bool containContain(struct nsjconf_t *nsjconf);
 
-#endif                         /* _CONTAIN_H */
+#endif                         /* NS_CONTAIN_H */

diff --git a/log.h b/log.h
index 04181b35b2acf0d5aebfe9636b45cf205f19a33a..f685039c93ee27e69261700396ee2ce9eaecda2f 100644 (file)
--- a/log.h
+++ b/log.h
@@ -19,8 +19,8 @@
 
 */
 
-#ifndef _LOG_H
-#define _LOG_H
+#ifndef NS_LOG_H
+#define NS_LOG_H
 
 #include <getopt.h>
 #include <stdbool.h>
@@ -59,4 +59,4 @@ void logStop(int sig);
 void logRedirectLogFD(int fd);
 void logDirectlyToFD(const char *msg);
 
-#endif                         /* _LOG_H */
+#endif                         /* NS_LOG_H */

diff --git a/mount.h b/mount.h
index 3f75973ad281c746e1f39c05e1d4751f4476d4ca..67efdbd8c864d28474ed6ff6d3c9e36839dcb3d6 100644 (file)
--- a/mount.h
+++ b/mount.h
@@ -19,8 +19,8 @@
 
 */
 
-#ifndef _MOUNT_H
-#define _MOUNT_H
+#ifndef NS_MOUNT_H
+#define NS_MOUNT_H
 
 #include <stdbool.h>
 
@@ -28,4 +28,4 @@
 
 bool mountInitNs(struct nsjconf_t *nsjconf);
 
-#endif                         /* _MOUNT_H */
+#endif                         /* NS_MOUNT_H */

diff --git a/net.h b/net.h
index 8b541aa63540a6c57ee258759ccda98bde13ecda..db1040f5e39d8f68219031e409633ff4788f78dd 100644 (file)
--- a/net.h
+++ b/net.h
@@ -19,8 +19,8 @@
 
 */
 
-#ifndef _NET_H
-#define _NET_H
+#ifndef NS_NET_H
+#define NS_NET_H
 
 #include <stdbool.h>
 #include <stddef.h>

diff --git a/nsjail.h b/nsjail.h
index a5d314568405838c2be15e6da7802357a1cea96a..7c3d7b99ad69d6c69a051432f88c2cce4427a4d9 100644 (file)
--- a/nsjail.h
+++ b/nsjail.h
@@ -20,8 +20,8 @@
 
 */
 
-#ifndef _NSJAIL_H
-#define _NSJAIL_H
+#ifndef NS_NSJAIL_H
+#define NS_NSJAIL_H
 
 #include "common.h"
 

diff --git a/sandbox.h b/sandbox.h
index 17291abf94ffd9194fb115f241f9b0464c813ae1..b28cc14be19fa38ce9df2f8040c511993f0756de 100644 (file)
--- a/sandbox.h
+++ b/sandbox.h
@@ -19,8 +19,8 @@
 
 */
 
-#ifndef _SANDBOX_H
-#define _SANDBOX_H
+#ifndef NS_SANDBOX_H
+#define NS_SANDBOX_H
 
 #include <stdbool.h>
 
@@ -28,4 +28,4 @@
 
 bool sandboxApply(struct nsjconf_t *nsjconf);
 
-#endif                         /* _SANDBOX_H */
+#endif                         /* NS_SANDBOX_H */

diff --git a/subproc.h b/subproc.h
index 27866bf609994e9aa9cc1fe808d909350b945310..ce25ca4735433f3e50c7283e52135a76e313c371 100644 (file)
--- a/subproc.h
+++ b/subproc.h
@@ -19,8 +19,8 @@
 
 */
 
-#ifndef _PROC_H
-#define _PROC_H
+#ifndef NS_PROC_H
+#define NS_PROC_H
 
 #include "common.h"
 
@@ -32,4 +32,4 @@ void subprocKillAll(struct nsjconf_t *nsjconf);
 /* Returns the exit code of the first failing subprocess, or 0 if none fail */
 int subprocReap(struct nsjconf_t *nsjconf);
 
-#endif                         /* _PROC_H */
+#endif                         /* NS_PROC_H */

diff --git a/user.h b/user.h
index c79135ce8b3b1acda5f123073a78946f08dab223..4ef208b1c37e2028d4ba6271395f15f80d3d3a05 100644 (file)
--- a/user.h
+++ b/user.h
@@ -19,8 +19,8 @@
 
 */
 
-#ifndef _USER_H
-#define _USER_H
+#ifndef NS_USER_H
+#define NS_USER_H
 
 #include <stdbool.h>
 
@@ -28,4 +28,4 @@
 
 bool userInitNsFromParent(struct nsjconf_t *nsjconf, pid_t pid);
 
-#endif                         /* _USER_H */
+#endif                         /* NS_USER_H */

diff --git a/util.h b/util.h
index 7e9d88a511dd8064275a4135e36e7a634636c55c..d9de66bd6abf3a62369e256ce350a3f0c025b69e 100644 (file)
--- a/util.h
+++ b/util.h
@@ -19,8 +19,8 @@
 
 */
 
-#ifndef _UTIL_H
-#define _UTIL_H
+#ifndef NS_UTIL_H
+#define NS_UTIL_H
 
 #include <stdbool.h>
 #include <stdlib.h>
@@ -32,4 +32,4 @@ ssize_t utilWriteToFd(int fd, const void *buf, size_t len);
 ssize_t utilReadFromFd(int fd, void *buf, size_t len);
 bool utilWriteBufToFile(char *filename, const void *buf, size_t len, int open_flags);
 
-#endif                         /* _UTIL_H */
+#endif                         /* NS_UTIL_H */

diff --git a/uts.h b/uts.h
index 73828083a748eaa507693692230d290e7cfbabc5..73b52becb348971b1f532a4ae0ad702e0525097a 100644 (file)
--- a/uts.h
+++ b/uts.h
@@ -19,8 +19,8 @@
 
 */
 
-#ifndef _UTS_H
-#define _UTS_H
+#ifndef NS_UTS_H
+#define NS_UTS_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -29,4 +29,4 @@
 
 bool utsInitNs(struct nsjconf_t *nsjconf);
 
-#endif                         /* _UTS_H */
+#endif                         /* NS_UTS_H */