move common.h to macros.h

diff --git a/Makefile b/Makefile
index feedfb6135c597fb36854591f2b148d3cd37367d..3176b20933880022c3bffb3c0c7d9c254c6cf861 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 a0bdaa8771a72f83fc734d4e9bcd6d951fa67acb..6143f3f4554b415c964643f3a5ac258316783e6e 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 3c185f97d142f282d4ad59e34f709d001840a7f3..a9835cb6e6c80e04edca3c2118bdec6e0c9a51b5 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/common.h b/common.h
deleted file mode 100644 (file)
index fbbe1a2..0000000
--- a/common.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-
-   nsjail - common macros
-   -----------------------------------------
-
-   Copyright 2014 Google Inc. All Rights Reserved.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-*/
-
-#ifndef NS_COMMON_H
-#define NS_COMMON_H
-
-#define ARRAYSIZE(array) (sizeof(array) / sizeof(*array))
-#define UNUSED __attribute__((unused))
-
-#if 0 /* Works, but needs -fblocks and libBlocksRuntime with clang */
-/* Go-style defer implementation */
-#define __STRMERGE(a, b) a##b
-#define _STRMERGE(a, b) __STRMERGE(a, b)
-
-#ifdef __clang__
-static void __attribute__ ((unused)) __clang_cleanup_func(void (^*dfunc) (void))
-{
-       (*dfunc) ();
-}
-
-#define defer                                            \
-       void (^_STRMERGE(__defer_f_, __COUNTER__))(void) \
-           __attribute__((cleanup(__clang_cleanup_func))) __attribute__((unused)) = ^
-#else
-#define __block
-#define _DEFER(a, count)                                                                          \
-       auto void _STRMERGE(__defer_f_, count)(void* _defer_arg __attribute__((unused)));         \
-       int _STRMERGE(__defer_var_, count) __attribute__((cleanup(_STRMERGE(__defer_f_, count)))) \
-           __attribute__((unused));                                                              \
-       void _STRMERGE(__defer_f_, count)(void* _defer_arg __attribute__((unused)))
-#define defer _DEFER(a, __COUNTER__)
-#endif
-#endif
-
-#define NS_VALSTR_STRUCT(x) \
-       { x, #x }
-
-#endif /* NS_COMMON_H */

diff --git a/config.cc b/config.cc
index bf6e2526141174108d589034a16a0a65d2be7538..2a39c5c3bd9d3dd50468d0236c4219c8998b0bc5 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/macros.h b/macros.h
new file mode 100644 (file)
index 0000000..0ed8b84
--- /dev/null
+++ b/macros.h
@@ -0,0 +1,69 @@
+/*
+
+   nsjail - common macros
+   -----------------------------------------
+
+   Copyright 2014 Google Inc. All Rights Reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+#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))
+
+#if 0 /* Works, but needs -fblocks and libBlocksRuntime with clang */
+/* Go-style defer implementation */
+#define __STRMERGE(a, b) a##b
+#define _STRMERGE(a, b) __STRMERGE(a, b)
+
+#ifdef __clang__
+static void __attribute__ ((unused)) __clang_cleanup_func(void (^*dfunc) (void))
+{
+       (*dfunc) ();
+}
+
+#define defer                                            \
+       void (^_STRMERGE(__defer_f_, __COUNTER__))(void) \
+           __attribute__((cleanup(__clang_cleanup_func))) __attribute__((unused)) = ^
+#else
+#define __block
+#define _DEFER(a, count)                                                                          \
+       auto void _STRMERGE(__defer_f_, count)(void* _defer_arg __attribute__((unused)));         \
+       int _STRMERGE(__defer_var_, count) __attribute__((cleanup(_STRMERGE(__defer_f_, count)))) \
+           __attribute__((unused));                                                              \
+       void _STRMERGE(__defer_f_, count)(void* _defer_arg __attribute__((unused)))
+#define defer _DEFER(a, __COUNTER__)
+#endif
+#endif
+
+#define NS_VALSTR_STRUCT(x) \
+       { x, #x }
+
+#endif /* NS_COMMON_H */

diff --git a/mnt.cc b/mnt.cc
index be1fb6d356bf5c3cb9bbd7431f6979cdc5dbaa31..35b4c82520e6814f4bdb603df73b78f55b8d9d91 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 2b9b9dd2667f2168e6bac93b6670f7fc627e05e2..dd508fc305531f140030bae071107ad14206e829 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 995a79e66ac3b2488a6858f8d4cc7f986f42266d..7b776a93add87152e053f7f4efe1df25b76f26f8 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 5692edaaf207ef8588b0d892df14a078986d1c59..6f563cb0f2c04a9725c1228d97536616595d666e 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 7579bb0b38b6e7cdb2c900cbccbb47a9cd59caa9..da499c38da2ddaa30d16c430caefbbf214d1809c 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 409d56c8ec6249ca88a57c54649c470a56fe9f98..2364092a138ffbc6125872f7cc77fa7a3c1a4f71 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 {