libsandbox: shorten the sandbox wrapper func names

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

39 files changed, 39 insertions, 39 deletions

diff --git a/libsandbox/wrapper-funcs/__open_2.c b/libsandbox/wrapper-funcs/__open_2.c
index a49bab5..b36428b 100644
--- a/libsandbox/wrapper-funcs/__open_2.c
+++ b/libsandbox/wrapper-funcs/__open_2.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO const char *pathname, int flags
 #define WRAPPER_ARGS pathname, flags
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE_OPEN_INT(pathname, flags)
+#define WRAPPER_SAFE() SB_SAFE_OPEN_INT(pathname, flags)
 #include "__openat_2.c"
diff --git a/libsandbox/wrapper-funcs/__openat_2.c b/libsandbox/wrapper-funcs/__openat_2.c
index c64909f..b7a6e09 100644
--- a/libsandbox/wrapper-funcs/__openat_2.c
+++ b/libsandbox/wrapper-funcs/__openat_2.c
@@ -8,7 +8,7 @@
 #ifndef WRAPPER_ARGS_PROTO /* let open() use us */
 # define WRAPPER_ARGS_PROTO int dirfd, const char *pathname, int flags
 # define WRAPPER_ARGS dirfd, pathname, flags
-# define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE_OPEN_INT_AT(dirfd, pathname, flags)
+# define WRAPPER_SAFE() SB_SAFE_OPEN_INT_AT(dirfd, pathname, flags)
 # define USE_AT 1
 #else
 # define USE_AT 0
diff --git a/libsandbox/wrapper-funcs/__wrapper_exec.c b/libsandbox/wrapper-funcs/__wrapper_exec.c
index 98e0dae..2052221 100644
--- a/libsandbox/wrapper-funcs/__wrapper_exec.c
+++ b/libsandbox/wrapper-funcs/__wrapper_exec.c
@@ -234,7 +234,7 @@ WRAPPER_RET_TYPE WRAPPER_NAME(WRAPPER_ARGS_PROTO)
 	if (strchr(path, '/'))
 # endif
 	{
-		if (!FUNCTION_SANDBOX_SAFE(path))
+		if (!SB_SAFE(path))
 			return result;
 
 		sb_check_exec(path, argv);
diff --git a/libsandbox/wrapper-funcs/__xmknod.c b/libsandbox/wrapper-funcs/__xmknod.c
index 178c7ae..ec06bd3 100644
--- a/libsandbox/wrapper-funcs/__xmknod.c
+++ b/libsandbox/wrapper-funcs/__xmknod.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO int ver, const char *pathname, mode_t mode, dev_t *dev
 #define WRAPPER_ARGS ver, pathname, mode, dev
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE(pathname)
+#define WRAPPER_SAFE() SB_SAFE(pathname)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/__xmknodat.c b/libsandbox/wrapper-funcs/__xmknodat.c
index 97e4689..1cf84f7 100644
--- a/libsandbox/wrapper-funcs/__xmknodat.c
+++ b/libsandbox/wrapper-funcs/__xmknodat.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO int ver, int dirfd, const char *pathname, mode_t mode, dev_t *dev
 #define WRAPPER_ARGS ver, dirfd, pathname, mode, dev
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE(pathname)
+#define WRAPPER_SAFE() SB_SAFE(pathname)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/_xmknod.c b/libsandbox/wrapper-funcs/_xmknod.c
index b60c716..512f937 100644
--- a/libsandbox/wrapper-funcs/_xmknod.c
+++ b/libsandbox/wrapper-funcs/_xmknod.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO const int ver, const char *pathname, mode_t mode, dev_t dev
 #define WRAPPER_ARGS ver, pathname, mode, dev
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE(pathname)
+#define WRAPPER_SAFE() SB_SAFE(pathname)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/access.c b/libsandbox/wrapper-funcs/access.c
index 895566f..7808b41 100644
--- a/libsandbox/wrapper-funcs/access.c
+++ b/libsandbox/wrapper-funcs/access.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO const char *pathname, int mode
 #define WRAPPER_ARGS pathname, mode
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE_ACCESS(pathname, mode)
+#define WRAPPER_SAFE() SB_SAFE_ACCESS(pathname, mode)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/chmod.c b/libsandbox/wrapper-funcs/chmod.c
index 2a0b513..77b8fa6 100644
--- a/libsandbox/wrapper-funcs/chmod.c
+++ b/libsandbox/wrapper-funcs/chmod.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO const char *path, mode_t mode
 #define WRAPPER_ARGS path, mode
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE(path)
+#define WRAPPER_SAFE() SB_SAFE(path)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/chown.c b/libsandbox/wrapper-funcs/chown.c
index bbf5fd6..69554d3 100644
--- a/libsandbox/wrapper-funcs/chown.c
+++ b/libsandbox/wrapper-funcs/chown.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO const char *path, uid_t owner, gid_t group
 #define WRAPPER_ARGS path, owner, group
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE(path)
+#define WRAPPER_SAFE() SB_SAFE(path)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/creat.c b/libsandbox/wrapper-funcs/creat.c
index a7e99d6..c167a13 100644
--- a/libsandbox/wrapper-funcs/creat.c
+++ b/libsandbox/wrapper-funcs/creat.c
@@ -18,7 +18,7 @@ int WRAPPER_NAME(WRAPPER_ARGS_PROTO)
 {
 	int result = -1;
 
-	if (FUNCTION_SANDBOX_SAFE(pathname))
+	if (SB_SAFE(pathname))
 		result = sb_unwrapped_open_DEFAULT(pathname, O_CREAT | O_WRONLY | O_TRUNC, mode);
 
 	return result;
diff --git a/libsandbox/wrapper-funcs/faccessat.c b/libsandbox/wrapper-funcs/faccessat.c
index c053f19..722b313 100644
--- a/libsandbox/wrapper-funcs/faccessat.c
+++ b/libsandbox/wrapper-funcs/faccessat.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO int dirfd, const char *pathname, int mode, int flags
 #define WRAPPER_ARGS dirfd, pathname, mode, flags
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE_ACCESS_AT(dirfd, pathname, mode)
+#define WRAPPER_SAFE() SB_SAFE_ACCESS_AT(dirfd, pathname, mode)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/fchmodat.c b/libsandbox/wrapper-funcs/fchmodat.c
index 31b4b80..d2d8ae4 100644
--- a/libsandbox/wrapper-funcs/fchmodat.c
+++ b/libsandbox/wrapper-funcs/fchmodat.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO int dirfd, const char *path, mode_t mode, int flags
 #define WRAPPER_ARGS dirfd, path, mode, flags
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE_AT(dirfd, path, flags)
+#define WRAPPER_SAFE() SB_SAFE_AT(dirfd, path, flags)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/fchownat.c b/libsandbox/wrapper-funcs/fchownat.c
index 01983a4..0584755 100644
--- a/libsandbox/wrapper-funcs/fchownat.c
+++ b/libsandbox/wrapper-funcs/fchownat.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO int dirfd, const char *path, uid_t owner, gid_t group, int flags
 #define WRAPPER_ARGS dirfd, path, owner, group, flags
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE_AT(dirfd, path, flags)
+#define WRAPPER_SAFE() SB_SAFE_AT(dirfd, path, flags)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/fopen.c b/libsandbox/wrapper-funcs/fopen.c
index b33c4df..1013013 100644
--- a/libsandbox/wrapper-funcs/fopen.c
+++ b/libsandbox/wrapper-funcs/fopen.c
@@ -7,7 +7,7 @@
 
 #define WRAPPER_ARGS_PROTO const char *pathname, const char *mode
 #define WRAPPER_ARGS pathname, mode
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE_OPEN_CHAR(pathname, mode)
+#define WRAPPER_SAFE() SB_SAFE_OPEN_CHAR(pathname, mode)
 #define WRAPPER_RET_TYPE FILE *
 #define WRAPPER_RET_DEFAULT NULL
 
diff --git a/libsandbox/wrapper-funcs/futimesat.c b/libsandbox/wrapper-funcs/futimesat.c
index d4724ee..d549e6a 100644
--- a/libsandbox/wrapper-funcs/futimesat.c
+++ b/libsandbox/wrapper-funcs/futimesat.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO int dirfd, const char *filename, const struct timeval times[]
 #define WRAPPER_ARGS dirfd, filename, times
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE_AT(dirfd, filename, 0)
+#define WRAPPER_SAFE() SB_SAFE_AT(dirfd, filename, 0)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/lchown.c b/libsandbox/wrapper-funcs/lchown.c
index e78031f..ae162c9 100644
--- a/libsandbox/wrapper-funcs/lchown.c
+++ b/libsandbox/wrapper-funcs/lchown.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO const char *path, uid_t owner, gid_t group
 #define WRAPPER_ARGS path, owner, group
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE(path)
+#define WRAPPER_SAFE() SB_SAFE(path)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/link.c b/libsandbox/wrapper-funcs/link.c
index d9aaa1e..c4d463e 100644
--- a/libsandbox/wrapper-funcs/link.c
+++ b/libsandbox/wrapper-funcs/link.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO const char *oldpath, const char *newpath
 #define WRAPPER_ARGS oldpath, newpath
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE(newpath)
+#define WRAPPER_SAFE() SB_SAFE(newpath)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/linkat.c b/libsandbox/wrapper-funcs/linkat.c
index b177119..675a25f 100644
--- a/libsandbox/wrapper-funcs/linkat.c
+++ b/libsandbox/wrapper-funcs/linkat.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO int olddirfd, const char *oldpath, int newdirfd, const char *newpath, int flags
 #define WRAPPER_ARGS olddirfd, oldpath, newdirfd, newpath, flags
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE_AT(newdirfd, newpath, flags)
+#define WRAPPER_SAFE() SB_SAFE_AT(newdirfd, newpath, flags)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/lutimes.c b/libsandbox/wrapper-funcs/lutimes.c
index d91a211..c608231 100644
--- a/libsandbox/wrapper-funcs/lutimes.c
+++ b/libsandbox/wrapper-funcs/lutimes.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO const char *filename, const struct timeval times[]
 #define WRAPPER_ARGS filename, times
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE(filename)
+#define WRAPPER_SAFE() SB_SAFE(filename)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/mkdir.c b/libsandbox/wrapper-funcs/mkdir.c
index 430233f..cc4cbee 100644
--- a/libsandbox/wrapper-funcs/mkdir.c
+++ b/libsandbox/wrapper-funcs/mkdir.c
@@ -7,7 +7,7 @@
 
 #define WRAPPER_ARGS_PROTO const char *pathname, mode_t mode
 #define WRAPPER_ARGS pathname, mode
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE(pathname)
+#define WRAPPER_SAFE() SB_SAFE(pathname)
 #define sb_mkdirat_pre_check sb_mkdir_pre_check
 #include "mkdirat.c"
 #undef sb_mkdirat_pre_check
diff --git a/libsandbox/wrapper-funcs/mkdirat.c b/libsandbox/wrapper-funcs/mkdirat.c
index 2eb1018..f809c9f 100644
--- a/libsandbox/wrapper-funcs/mkdirat.c
+++ b/libsandbox/wrapper-funcs/mkdirat.c
@@ -8,7 +8,7 @@
 #ifndef WRAPPER_ARGS_PROTO /* let mkdir() use us */
 # define WRAPPER_ARGS_PROTO int dirfd, const char *pathname, mode_t mode
 # define WRAPPER_ARGS dirfd, pathname, mode
-# define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE_AT(dirfd, pathname, 0)
+# define WRAPPER_SAFE() SB_SAFE_AT(dirfd, pathname, 0)
 #endif
 
 static inline bool sb_mkdirat_pre_check(WRAPPER_ARGS_PROTO)
diff --git a/libsandbox/wrapper-funcs/mkfifo.c b/libsandbox/wrapper-funcs/mkfifo.c
index 246643a..d94a51c 100644
--- a/libsandbox/wrapper-funcs/mkfifo.c
+++ b/libsandbox/wrapper-funcs/mkfifo.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO const char *pathname, mode_t mode
 #define WRAPPER_ARGS pathname, mode
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE(pathname)
+#define WRAPPER_SAFE() SB_SAFE(pathname)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/mkfifoat.c b/libsandbox/wrapper-funcs/mkfifoat.c
index 06479c5..54d372b 100644
--- a/libsandbox/wrapper-funcs/mkfifoat.c
+++ b/libsandbox/wrapper-funcs/mkfifoat.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO int dirfd, const char *pathname, mode_t mode
 #define WRAPPER_ARGS dirfd, pathname, mode
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE_AT(dirfd, pathname, 0)
+#define WRAPPER_SAFE() SB_SAFE_AT(dirfd, pathname, 0)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/mknod.c b/libsandbox/wrapper-funcs/mknod.c
index d0b52cc..3bc09bf 100644
--- a/libsandbox/wrapper-funcs/mknod.c
+++ b/libsandbox/wrapper-funcs/mknod.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO const char *pathname, mode_t mode, dev_t dev
 #define WRAPPER_ARGS pathname, mode, dev
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE(pathname)
+#define WRAPPER_SAFE() SB_SAFE(pathname)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/mknodat.c b/libsandbox/wrapper-funcs/mknodat.c
index 53f29cf..5cbf613 100644
--- a/libsandbox/wrapper-funcs/mknodat.c
+++ b/libsandbox/wrapper-funcs/mknodat.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO int dirfd, const char *pathname, mode_t mode, dev_t dev
 #define WRAPPER_ARGS dirfd, pathname, mode, dev
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE_AT(dirfd, pathname, 0)
+#define WRAPPER_SAFE() SB_SAFE_AT(dirfd, pathname, 0)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/open.c b/libsandbox/wrapper-funcs/open.c
index fd23f31..e6a3715 100644
--- a/libsandbox/wrapper-funcs/open.c
+++ b/libsandbox/wrapper-funcs/open.c
@@ -10,5 +10,5 @@
 #define WRAPPER_ARGS_PROTO_FULL _WRAPPER_ARGS_PROTO, mode_t mode
 #define WRAPPER_ARGS pathname, flags
 #define WRAPPER_ARGS_FULL WRAPPER_ARGS, mode
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE_OPEN_INT(pathname, flags)
+#define WRAPPER_SAFE() SB_SAFE_OPEN_INT(pathname, flags)
 #include "openat.c"
diff --git a/libsandbox/wrapper-funcs/openat.c b/libsandbox/wrapper-funcs/openat.c
index 68d90a5..123b7c2 100644
--- a/libsandbox/wrapper-funcs/openat.c
+++ b/libsandbox/wrapper-funcs/openat.c
@@ -11,7 +11,7 @@
 # define WRAPPER_ARGS_PROTO_FULL _WRAPPER_ARGS_PROTO, mode_t mode
 # define WRAPPER_ARGS dirfd, pathname, flags
 # define WRAPPER_ARGS_FULL WRAPPER_ARGS, mode
-# define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE_OPEN_INT_AT(dirfd, pathname, flags)
+# define WRAPPER_SAFE() SB_SAFE_OPEN_INT_AT(dirfd, pathname, flags)
 # define USE_AT 1
 #else
 # define USE_AT 0
diff --git a/libsandbox/wrapper-funcs/opendir.c b/libsandbox/wrapper-funcs/opendir.c
index 2db2582..7670775 100644
--- a/libsandbox/wrapper-funcs/opendir.c
+++ b/libsandbox/wrapper-funcs/opendir.c
@@ -7,7 +7,7 @@
 
 #define WRAPPER_ARGS_PROTO const char *name
 #define WRAPPER_ARGS name
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE(name)
+#define WRAPPER_SAFE() SB_SAFE(name)
 #define WRAPPER_RET_TYPE DIR *
 #define WRAPPER_RET_DEFAULT NULL
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/rename.c b/libsandbox/wrapper-funcs/rename.c
index 1a194c9..ea52b3b 100644
--- a/libsandbox/wrapper-funcs/rename.c
+++ b/libsandbox/wrapper-funcs/rename.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO const char *oldpath, const char *newpath
 #define WRAPPER_ARGS oldpath, newpath
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE(oldpath) && FUNCTION_SANDBOX_SAFE(newpath)
+#define WRAPPER_SAFE() SB_SAFE(oldpath) && SB_SAFE(newpath)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/renameat.c b/libsandbox/wrapper-funcs/renameat.c
index 84a9aba..322af1b 100644
--- a/libsandbox/wrapper-funcs/renameat.c
+++ b/libsandbox/wrapper-funcs/renameat.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO int olddirfd, const char *oldpath, int newdirfd, const char *newpath
 #define WRAPPER_ARGS olddirfd, oldpath, newdirfd, newpath
-#define WRAPPER_SAFE() (FUNCTION_SANDBOX_SAFE_AT(olddirfd, oldpath, 0) && FUNCTION_SANDBOX_SAFE_AT(newdirfd, newpath, 0))
+#define WRAPPER_SAFE() (SB_SAFE_AT(olddirfd, oldpath, 0) && SB_SAFE_AT(newdirfd, newpath, 0))
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/rmdir.c b/libsandbox/wrapper-funcs/rmdir.c
index 5348b2e..77fa022 100644
--- a/libsandbox/wrapper-funcs/rmdir.c
+++ b/libsandbox/wrapper-funcs/rmdir.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO const char *pathname
 #define WRAPPER_ARGS pathname
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE(pathname)
+#define WRAPPER_SAFE() SB_SAFE(pathname)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/symlink.c b/libsandbox/wrapper-funcs/symlink.c
index 9fbb597..b078603 100644
--- a/libsandbox/wrapper-funcs/symlink.c
+++ b/libsandbox/wrapper-funcs/symlink.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO const char *oldpath, const char *newpath
 #define WRAPPER_ARGS oldpath, newpath
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE(newpath)
+#define WRAPPER_SAFE() SB_SAFE(newpath)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/symlinkat.c b/libsandbox/wrapper-funcs/symlinkat.c
index e54128b..1226281 100644
--- a/libsandbox/wrapper-funcs/symlinkat.c
+++ b/libsandbox/wrapper-funcs/symlinkat.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO const char *oldpath, int newdirfd, const char *newpath
 #define WRAPPER_ARGS oldpath, newdirfd, newpath
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE_AT(newdirfd, newpath, 0)
+#define WRAPPER_SAFE() SB_SAFE_AT(newdirfd, newpath, 0)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/truncate.c b/libsandbox/wrapper-funcs/truncate.c
index 0b90467..b0b5674 100644
--- a/libsandbox/wrapper-funcs/truncate.c
+++ b/libsandbox/wrapper-funcs/truncate.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO const char *path, off_t length
 #define WRAPPER_ARGS path, length
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE(path)
+#define WRAPPER_SAFE() SB_SAFE(path)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/unlink.c b/libsandbox/wrapper-funcs/unlink.c
index 2d7f560..79cab10 100644
--- a/libsandbox/wrapper-funcs/unlink.c
+++ b/libsandbox/wrapper-funcs/unlink.c
@@ -7,7 +7,7 @@
 
 #define WRAPPER_ARGS_PROTO const char *pathname
 #define WRAPPER_ARGS pathname
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE(pathname)
+#define WRAPPER_SAFE() SB_SAFE(pathname)
 #define sb_unlinkat_pre_check sb_unlink_pre_check
 #include "unlinkat.c"
 #undef sb_unlinkat_pre_check
diff --git a/libsandbox/wrapper-funcs/unlinkat.c b/libsandbox/wrapper-funcs/unlinkat.c
index ea23aa7..4ef4a3b 100644
--- a/libsandbox/wrapper-funcs/unlinkat.c
+++ b/libsandbox/wrapper-funcs/unlinkat.c
@@ -8,7 +8,7 @@
 #ifndef WRAPPER_ARGS_PROTO /* let unlink() use us */
 # define WRAPPER_ARGS_PROTO int dirfd, const char *pathname, int flags
 # define WRAPPER_ARGS dirfd, pathname, flags
-# define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE_AT(dirfd, pathname, flags)
+# define WRAPPER_SAFE() SB_SAFE_AT(dirfd, pathname, flags)
 #endif
 
 static inline bool sb_unlinkat_pre_check(WRAPPER_ARGS_PROTO)
diff --git a/libsandbox/wrapper-funcs/utime.c b/libsandbox/wrapper-funcs/utime.c
index cf3e505..f0a6814 100644
--- a/libsandbox/wrapper-funcs/utime.c
+++ b/libsandbox/wrapper-funcs/utime.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO const char *filename, const struct utimbuf *times
 #define WRAPPER_ARGS filename, times
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE(filename)
+#define WRAPPER_SAFE() SB_SAFE(filename)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/utimensat.c b/libsandbox/wrapper-funcs/utimensat.c
index 8a096ba..e0d8ee1 100644
--- a/libsandbox/wrapper-funcs/utimensat.c
+++ b/libsandbox/wrapper-funcs/utimensat.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO int dirfd, const char *filename, const struct timespec times[], int flags
 #define WRAPPER_ARGS dirfd, filename, times, flags
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE_AT(dirfd, filename, flags)
+#define WRAPPER_SAFE() SB_SAFE_AT(dirfd, filename, flags)
 #include "__wrapper_simple.c"
diff --git a/libsandbox/wrapper-funcs/utimes.c b/libsandbox/wrapper-funcs/utimes.c
index 7869366..c361c36 100644
--- a/libsandbox/wrapper-funcs/utimes.c
+++ b/libsandbox/wrapper-funcs/utimes.c
@@ -7,5 +7,5 @@
 
 #define WRAPPER_ARGS_PROTO const char *filename, const struct timeval times[]
 #define WRAPPER_ARGS filename, times
-#define WRAPPER_SAFE() FUNCTION_SANDBOX_SAFE(filename)
+#define WRAPPER_SAFE() SB_SAFE(filename)
 #include "__wrapper_simple.c"