move common.h to macros.h

diff --git a/Makefile b/Makefile
index feedfb6..3176b20 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -90,23 +90,23 @@ indent:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-caps.o: caps.h nsjail.h common.h log.h util.h
+caps.o: caps.h nsjail.h log.h macros.h util.h
 cgroup.o: cgroup.h nsjail.h log.h util.h
-cmdline.o: cmdline.h nsjail.h caps.h common.h config.h log.h mnt.h sandbox.h
+cmdline.o: cmdline.h nsjail.h caps.h config.h log.h macros.h mnt.h sandbox.h
 cmdline.o: user.h util.h
-config.o: caps.h nsjail.h cmdline.h common.h config.h log.h mnt.h user.h
+config.o: caps.h nsjail.h cmdline.h config.h log.h macros.h mnt.h user.h
 config.o: util.h
 contain.o: contain.h nsjail.h caps.h cgroup.h cpu.h log.h mnt.h net.h pid.h
 contain.o: user.h uts.h
 cpu.o: cpu.h nsjail.h log.h util.h
 log.o: log.h nsjail.h
-mnt.o: mnt.h nsjail.h common.h log.h subproc.h util.h
+mnt.o: mnt.h nsjail.h log.h macros.h subproc.h util.h
 net.o: net.h nsjail.h log.h subproc.h
-nsjail.o: nsjail.h cmdline.h common.h log.h net.h subproc.h util.h
+nsjail.o: nsjail.h cmdline.h log.h macros.h net.h subproc.h util.h
 pid.o: pid.h nsjail.h log.h subproc.h
 sandbox.o: sandbox.h nsjail.h kafel/include/kafel.h log.h
-subproc.o: subproc.h nsjail.h cgroup.h common.h contain.h log.h net.h
+subproc.o: subproc.h nsjail.h cgroup.h contain.h log.h macros.h net.h
 subproc.o: sandbox.h user.h util.h
 uts.o: uts.h nsjail.h log.h
-user.o: user.h nsjail.h common.h log.h subproc.h util.h
-util.o: util.h nsjail.h common.h log.h
+user.o: user.h nsjail.h log.h macros.h subproc.h util.h
+util.o: util.h nsjail.h log.h macros.h

diff --git a/caps.cc b/caps.cc
index a0bdaa8..6143f3f 100644 (file)
--- a/caps.cc
+++ b/caps.cc
@@ -28,8 +28,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "log.h"
+#include "macros.h"
 #include "util.h"
 
 namespace caps {

diff --git a/cmdline.cc b/cmdline.cc
index 3c185f9..a9835cb 100644 (file)
--- a/cmdline.cc
+++ b/cmdline.cc
@@ -45,9 +45,9 @@
 #include <memory>
 
 #include "caps.h"
-#include "common.h"
 #include "config.h"
 #include "log.h"
+#include "macros.h"
 #include "mnt.h"
 #include "sandbox.h"
 #include "user.h"

diff --git a/config.cc b/config.cc
index bf6e252..2a39c5c 100644 (file)
--- a/config.cc
+++ b/config.cc
@@ -35,10 +35,10 @@
 
 #include "caps.h"
 #include "cmdline.h"
-#include "common.h"
 #include "config.h"
 #include "config.pb.h"
 #include "log.h"
+#include "macros.h"
 #include "mnt.h"
 #include "user.h"
 #include "util.h"

diff --git a/common.h b/macros.h
similarity index 81%
rename from common.h
rename to macros.h
index fbbe1a2..0ed8b84 100644 (file)
--- a/common.h
+++ b/macros.h
@@ -22,6 +22,19 @@
 #ifndef NS_COMMON_H
 #define NS_COMMON_H
 
+#include <unistd.h>
+
+#if !defined(TEMP_FAILURE_RETRY)
+#define TEMP_FAILURE_RETRY(expression)                     \
+       (__extension__({                                   \
+               long int __result;                         \
+               do                                         \
+                       __result = (long int)(expression); \
+               while (__result == -1L && errno == EINTR); \
+               __result;                                  \
+       }))
+#endif /* !defined(TEMP_FAILURE_RETRY) */
+
 #define ARRAYSIZE(array) (sizeof(array) / sizeof(*array))
 #define UNUSED __attribute__((unused))
 

diff --git a/mnt.cc b/mnt.cc
index be1fb6d..35b4c82 100644 (file)
--- a/mnt.cc
+++ b/mnt.cc
@@ -41,8 +41,8 @@
 #include <syscall.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "log.h"
+#include "macros.h"
 #include "subproc.h"
 #include "util.h"
 

diff --git a/nsjail.cc b/nsjail.cc
index 2b9b9dd..dd508fc 100644 (file)
--- a/nsjail.cc
+++ b/nsjail.cc
@@ -30,8 +30,8 @@
 #include <unistd.h>
 
 #include "cmdline.h"
-#include "common.h"
 #include "log.h"
+#include "macros.h"
 #include "net.h"
 #include "subproc.h"
 #include "util.h"

diff --git a/nsjail.h b/nsjail.h
index 995a79e..7b776a9 100644 (file)
--- a/nsjail.h
+++ b/nsjail.h
@@ -36,17 +36,6 @@
 #include <string>
 #include <vector>
 
-#if !defined(TEMP_FAILURE_RETRY)
-#define TEMP_FAILURE_RETRY(expression)                     \
-       (__extension__({                                   \
-               long int __result;                         \
-               do                                         \
-                       __result = (long int)(expression); \
-               while (__result == -1L && errno == EINTR); \
-               __result;                                  \
-       }))
-#endif /* !defined(TEMP_FAILURE_RETRY) */
-
 static const int nssigs[] = {
     SIGINT,
     SIGQUIT,
@@ -62,8 +51,6 @@ struct pids_t {
        char remote_txt[64];
        struct sockaddr_in6 remote_addr;
        int pid_syscall_fd;
-       TAILQ_ENTRY(pids_t)
-       pointers;
 };
 
 struct mounts_t {
@@ -78,8 +65,7 @@ struct mounts_t {
        bool isSymlink;
        bool mandatory;
        bool mounted;
-       TAILQ_ENTRY(mounts_t)
-       pointers;
+       TAILQ_ENTRY(mounts_t) pointers;
 };
 
 struct idmap_t {
@@ -87,8 +73,6 @@ struct idmap_t {
        uid_t outside_id;
        size_t count;
        bool is_newidmap;
-       TAILQ_ENTRY(idmap_t)
-       pointers;
 };
 
 enum ns_mode_t {

diff --git a/subproc.cc b/subproc.cc
index 5692eda..6f563cb 100644 (file)
--- a/subproc.cc
+++ b/subproc.cc
@@ -43,9 +43,9 @@
 #include <unistd.h>
 
 #include "cgroup.h"
-#include "common.h"
 #include "contain.h"
 #include "log.h"
+#include "macros.h"
 #include "net.h"
 #include "sandbox.h"
 #include "user.h"

diff --git a/user.cc b/user.cc
index 7579bb0..da499c3 100644 (file)
--- a/user.cc
+++ b/user.cc
@@ -39,8 +39,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "log.h"
+#include "macros.h"
 #include "subproc.h"
 #include "util.h"
 

diff --git a/util.cc b/util.cc
index 409d56c..2364092 100644 (file)
--- a/util.cc
+++ b/util.cc
@@ -40,8 +40,8 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "common.h"
 #include "log.h"
+#include "macros.h"
 
 namespace util {