libsandbox: push STRING_NAME into libsandbox.h

Since all FUNCTION_SANDBOX_SAFE() need to pass up the func name, push the
usage into the macro itself rather than every wrapper file.

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

37 files changed, 59 insertions, 57 deletions

diff --git a/libsandbox/libsandbox.h b/libsandbox/libsandbox.h
index da42adf..c1b35dd 100644
--- a/libsandbox/libsandbox.h
+++ b/libsandbox/libsandbox.h
@@ -14,25 +14,25 @@
 #undef strdup
 
 /* Macros to check if a function should be executed */
-#define FUNCTION_SANDBOX_SAFE_AT(_dirfd, _func, _path) \
-	((0 == is_sandbox_on()) || (1 == before_syscall(_dirfd, _func, _path)))
-#define FUNCTION_SANDBOX_SAFE(_func, _path) \
-        FUNCTION_SANDBOX_SAFE_AT(AT_FDCWD, _func, _path)
-
-#define FUNCTION_SANDBOX_SAFE_ACCESS_AT(_dirfd, _func, _path, _flags) \
-	((0 == is_sandbox_on()) || (1 == before_syscall_access(_dirfd, _func, _path, _flags)))
-#define FUNCTION_SANDBOX_SAFE_ACCESS(_func, _path, _flags) \
-        FUNCTION_SANDBOX_SAFE_ACCESS_AT(AT_FDCWD, _func, _path, _flags)
-
-#define FUNCTION_SANDBOX_SAFE_OPEN_INT_AT(_dirfd, _func, _path, _flags) \
-	((0 == is_sandbox_on()) || (1 == before_syscall_open_int(_dirfd, _func, _path, _flags)))
-#define FUNCTION_SANDBOX_SAFE_OPEN_INT(_func, _path, _flags) \
-        FUNCTION_SANDBOX_SAFE_OPEN_INT_AT(AT_FDCWD, _func, _path, _flags)
-
-#define FUNCTION_SANDBOX_SAFE_OPEN_CHAR_AT(_dirfd, _func, _path, _mode) \
-	((0 == is_sandbox_on()) || (1 == before_syscall_open_char(_dirfd, _func, _path, _mode)))
-#define FUNCTION_SANDBOX_SAFE_OPEN_CHAR(_func, _path, _mode) \
-        FUNCTION_SANDBOX_SAFE_OPEN_CHAR_AT(AT_FDCWD, _func, _path, _mode)
+#define FUNCTION_SANDBOX_SAFE_AT(_dirfd, _path) \
+	((0 == is_sandbox_on()) || (1 == before_syscall(_dirfd, STRING_NAME, _path)))
+#define FUNCTION_SANDBOX_SAFE(_path) \
+        FUNCTION_SANDBOX_SAFE_AT(AT_FDCWD, _path)
+
+#define FUNCTION_SANDBOX_SAFE_ACCESS_AT(_dirfd, _path, _flags) \
+	((0 == is_sandbox_on()) || (1 == before_syscall_access(_dirfd, STRING_NAME, _path, _flags)))
+#define FUNCTION_SANDBOX_SAFE_ACCESS(_path, _flags) \
+        FUNCTION_SANDBOX_SAFE_ACCESS_AT(AT_FDCWD, _path, _flags)
+
+#define FUNCTION_SANDBOX_SAFE_OPEN_INT_AT(_dirfd, _path, _flags) \
+	((0 == is_sandbox_on()) || (1 == before_syscall_open_int(_dirfd, STRING_NAME, _path, _flags)))
+#define FUNCTION_SANDBOX_SAFE_OPEN_INT(_path, _flags) \
+        FUNCTION_SANDBOX_SAFE_OPEN_INT_AT(AT_FDCWD, _path, _flags)
+
+#define FUNCTION_SANDBOX_SAFE_OPEN_CHAR_AT(_dirfd, _path, _mode) \
+	((0 == is_sandbox_on()) || (1 == before_syscall_open_char(_dirfd, STRING_NAME, _path, _mode)))
+#define FUNCTION_SANDBOX_SAFE_OPEN_CHAR(_path, _mode) \
+        FUNCTION_SANDBOX_SAFE_OPEN_CHAR_AT(AT_FDCWD, _path, _mode)
 
 int canonicalize(const char *, char *);
 
diff --git a/libsandbox/wrapper-funcs/__xmknod.c b/libsandbox/wrapper-funcs/__xmknod.c
index 2b09dc8..563ddab 100644
--- a/libsandbox/wrapper-funcs/__xmknod.c
+++ b/libsandbox/wrapper-funcs/__xmknod.c
@@ -16,7 +16,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE(STRING_NAME, pathname) {
+	if (FUNCTION_SANDBOX_SAFE(pathname)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(ver, pathname, mode, dev);
diff --git a/libsandbox/wrapper-funcs/access.c b/libsandbox/wrapper-funcs/access.c
index 9a4c46e..9823e1d 100644
--- a/libsandbox/wrapper-funcs/access.c
+++ b/libsandbox/wrapper-funcs/access.c
@@ -16,7 +16,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE_ACCESS(STRING_NAME, pathname, mode) {
+	if (FUNCTION_SANDBOX_SAFE_ACCESS(pathname, mode)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(pathname, mode);
diff --git a/libsandbox/wrapper-funcs/chmod.c b/libsandbox/wrapper-funcs/chmod.c
index 3134c73..a57c1d0 100644
--- a/libsandbox/wrapper-funcs/chmod.c
+++ b/libsandbox/wrapper-funcs/chmod.c
@@ -16,7 +16,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE(STRING_NAME, path) {
+	if (FUNCTION_SANDBOX_SAFE(path)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(path, mode);
diff --git a/libsandbox/wrapper-funcs/chown.c b/libsandbox/wrapper-funcs/chown.c
index 3a72d44..c692f9e 100644
--- a/libsandbox/wrapper-funcs/chown.c
+++ b/libsandbox/wrapper-funcs/chown.c
@@ -16,7 +16,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE(STRING_NAME, path) {
+	if (FUNCTION_SANDBOX_SAFE(path)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(path, owner, group);
diff --git a/libsandbox/wrapper-funcs/creat.c b/libsandbox/wrapper-funcs/creat.c
index aa3aaa5..b38e956 100644
--- a/libsandbox/wrapper-funcs/creat.c
+++ b/libsandbox/wrapper-funcs/creat.c
@@ -17,7 +17,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE(STRING_NAME, pathname) {
+	if (FUNCTION_SANDBOX_SAFE(pathname)) {
 		check_dlsym(true_open_DEFAULT, symname_open_DEFAULT,
 			    symver_open_DEFAULT);
 		result = true_open_DEFAULT(pathname, O_CREAT | O_WRONLY | O_TRUNC, mode);
diff --git a/libsandbox/wrapper-funcs/creat64.c b/libsandbox/wrapper-funcs/creat64.c
index 5e83d0e..7c30d44 100644
--- a/libsandbox/wrapper-funcs/creat64.c
+++ b/libsandbox/wrapper-funcs/creat64.c
@@ -17,7 +17,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE(STRING_NAME, pathname) {
+	if (FUNCTION_SANDBOX_SAFE(pathname)) {
 		check_dlsym(true_open64_DEFAULT, symname_open64_DEFAULT,
 			    symver_open64_DEFAULT);
 		result = true_open64_DEFAULT(pathname, O_CREAT | O_WRONLY | O_TRUNC, mode);
diff --git a/libsandbox/wrapper-funcs/execve.c b/libsandbox/wrapper-funcs/execve.c
index ff0a061..d239eb1 100644
--- a/libsandbox/wrapper-funcs/execve.c
+++ b/libsandbox/wrapper-funcs/execve.c
@@ -74,7 +74,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 	int result = -1;
 	int count;
 
-	if (!FUNCTION_SANDBOX_SAFE(STRING_NAME, filename))
+	if (!FUNCTION_SANDBOX_SAFE(filename))
 		return result;
 
 	check_exec(filename);
diff --git a/libsandbox/wrapper-funcs/faccessat.c b/libsandbox/wrapper-funcs/faccessat.c
index 9f43689..8a55d77 100644
--- a/libsandbox/wrapper-funcs/faccessat.c
+++ b/libsandbox/wrapper-funcs/faccessat.c
@@ -16,7 +16,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE_ACCESS_AT(dirfd, STRING_NAME, pathname, mode) {
+	if (FUNCTION_SANDBOX_SAFE_ACCESS_AT(dirfd, pathname, mode)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(dirfd, pathname, mode, flags);
diff --git a/libsandbox/wrapper-funcs/fchmodat.c b/libsandbox/wrapper-funcs/fchmodat.c
index 839655b..6a1490a 100644
--- a/libsandbox/wrapper-funcs/fchmodat.c
+++ b/libsandbox/wrapper-funcs/fchmodat.c
@@ -16,7 +16,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE_AT(dirfd, STRING_NAME, path) {
+	if (FUNCTION_SANDBOX_SAFE_AT(dirfd, path)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(dirfd, path, mode, flags);
diff --git a/libsandbox/wrapper-funcs/fchownat.c b/libsandbox/wrapper-funcs/fchownat.c
index d9da42b..c2e99c0 100644
--- a/libsandbox/wrapper-funcs/fchownat.c
+++ b/libsandbox/wrapper-funcs/fchownat.c
@@ -16,7 +16,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE_AT(dirfd, STRING_NAME, path) {
+	if (FUNCTION_SANDBOX_SAFE_AT(dirfd, path)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(dirfd, path, owner, group, flags);
diff --git a/libsandbox/wrapper-funcs/fopen.c b/libsandbox/wrapper-funcs/fopen.c
index 2e285f2..0316723 100644
--- a/libsandbox/wrapper-funcs/fopen.c
+++ b/libsandbox/wrapper-funcs/fopen.c
@@ -26,7 +26,7 @@ FILE *WRAPPER_NAME(WRAPPER_ARGS)
 	}
 	errno = old_errno;
 
-	if FUNCTION_SANDBOX_SAFE_OPEN_CHAR(STRING_NAME, pathname, mode) {
+	if (FUNCTION_SANDBOX_SAFE_OPEN_CHAR(pathname, mode)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(pathname, mode);
diff --git a/libsandbox/wrapper-funcs/futimesat.c b/libsandbox/wrapper-funcs/futimesat.c
index efac7c7..efa9653 100644
--- a/libsandbox/wrapper-funcs/futimesat.c
+++ b/libsandbox/wrapper-funcs/futimesat.c
@@ -13,7 +13,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE_AT(dirfd, STRING_NAME, filename) {
+	if (FUNCTION_SANDBOX_SAFE_AT(dirfd, filename)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(dirfd, filename, times);
diff --git a/libsandbox/wrapper-funcs/lchown.c b/libsandbox/wrapper-funcs/lchown.c
index 74cce06..bb86b25 100644
--- a/libsandbox/wrapper-funcs/lchown.c
+++ b/libsandbox/wrapper-funcs/lchown.c
@@ -16,7 +16,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE(STRING_NAME, path) {
+	if (FUNCTION_SANDBOX_SAFE(path)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(path, owner, group);
diff --git a/libsandbox/wrapper-funcs/link.c b/libsandbox/wrapper-funcs/link.c
index d4b821b..caa330d 100644
--- a/libsandbox/wrapper-funcs/link.c
+++ b/libsandbox/wrapper-funcs/link.c
@@ -13,7 +13,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE(STRING_NAME, newpath) {
+	if (FUNCTION_SANDBOX_SAFE(newpath)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(oldpath, newpath);
diff --git a/libsandbox/wrapper-funcs/linkat.c b/libsandbox/wrapper-funcs/linkat.c
index 069b3d3..2db52b0 100644
--- a/libsandbox/wrapper-funcs/linkat.c
+++ b/libsandbox/wrapper-funcs/linkat.c
@@ -13,7 +13,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE_AT(newdirfd, STRING_NAME, newpath) {
+	if (FUNCTION_SANDBOX_SAFE_AT(newdirfd, newpath)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(olddirfd, oldpath, newdirfd, newpath, flags);
diff --git a/libsandbox/wrapper-funcs/lutimes.c b/libsandbox/wrapper-funcs/lutimes.c
index 57ed650..fabb1ab 100644
--- a/libsandbox/wrapper-funcs/lutimes.c
+++ b/libsandbox/wrapper-funcs/lutimes.c
@@ -13,7 +13,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE(STRING_NAME, filename) {
+	if (FUNCTION_SANDBOX_SAFE(filename)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(filename, times);
diff --git a/libsandbox/wrapper-funcs/mkdir.c b/libsandbox/wrapper-funcs/mkdir.c
index b9d6505..342a94c 100644
--- a/libsandbox/wrapper-funcs/mkdir.c
+++ b/libsandbox/wrapper-funcs/mkdir.c
@@ -30,7 +30,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 	}
 	errno = old_errno;
 
-	if FUNCTION_SANDBOX_SAFE(STRING_NAME, pathname) {
+	if (FUNCTION_SANDBOX_SAFE(pathname)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(pathname, mode);
diff --git a/libsandbox/wrapper-funcs/mkdirat.c b/libsandbox/wrapper-funcs/mkdirat.c
index aec4dae..2d559b1 100644
--- a/libsandbox/wrapper-funcs/mkdirat.c
+++ b/libsandbox/wrapper-funcs/mkdirat.c
@@ -30,7 +30,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 	}
 	errno = old_errno;
 
-	if FUNCTION_SANDBOX_SAFE_AT(dirfd, STRING_NAME, pathname) {
+	if (FUNCTION_SANDBOX_SAFE_AT(dirfd, pathname)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(dirfd, pathname, mode);
diff --git a/libsandbox/wrapper-funcs/mkfifo.c b/libsandbox/wrapper-funcs/mkfifo.c
index 146f9e1..7000222 100644
--- a/libsandbox/wrapper-funcs/mkfifo.c
+++ b/libsandbox/wrapper-funcs/mkfifo.c
@@ -16,7 +16,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE(STRING_NAME, pathname) {
+	if (FUNCTION_SANDBOX_SAFE(pathname)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(pathname, mode);
diff --git a/libsandbox/wrapper-funcs/mkfifoat.c b/libsandbox/wrapper-funcs/mkfifoat.c
index ac7b9eb..b0a9e33 100644
--- a/libsandbox/wrapper-funcs/mkfifoat.c
+++ b/libsandbox/wrapper-funcs/mkfifoat.c
@@ -16,7 +16,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE_AT(dirfd, STRING_NAME, pathname) {
+	if (FUNCTION_SANDBOX_SAFE_AT(dirfd, pathname)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(dirfd, pathname, mode);
diff --git a/libsandbox/wrapper-funcs/mknod.c b/libsandbox/wrapper-funcs/mknod.c
index 965ce9e..0e0cff9 100644
--- a/libsandbox/wrapper-funcs/mknod.c
+++ b/libsandbox/wrapper-funcs/mknod.c
@@ -16,7 +16,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE(STRING_NAME, pathname) {
+	if (FUNCTION_SANDBOX_SAFE(pathname)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(pathname, mode, dev);
diff --git a/libsandbox/wrapper-funcs/mknodat.c b/libsandbox/wrapper-funcs/mknodat.c
index f2a4f44..8bc6b45 100644
--- a/libsandbox/wrapper-funcs/mknodat.c
+++ b/libsandbox/wrapper-funcs/mknodat.c
@@ -16,7 +16,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE_AT(dirfd, STRING_NAME, pathname) {
+	if (FUNCTION_SANDBOX_SAFE_AT(dirfd, pathname)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(dirfd, pathname, mode, dev);
diff --git a/libsandbox/wrapper-funcs/open.c b/libsandbox/wrapper-funcs/open.c
index 18605df..dda8c98 100644
--- a/libsandbox/wrapper-funcs/open.c
+++ b/libsandbox/wrapper-funcs/open.c
@@ -33,7 +33,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 	}
 	errno = old_errno;
 
-	if FUNCTION_SANDBOX_SAFE_OPEN_INT(STRING_NAME, pathname, flags) {
+	if (FUNCTION_SANDBOX_SAFE_OPEN_INT(pathname, flags)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		if (flags & O_CREAT)
diff --git a/libsandbox/wrapper-funcs/openat.c b/libsandbox/wrapper-funcs/openat.c
index fa07dd8..02e9b07 100644
--- a/libsandbox/wrapper-funcs/openat.c
+++ b/libsandbox/wrapper-funcs/openat.c
@@ -34,7 +34,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 	}
 	errno = old_errno;
 
-	if FUNCTION_SANDBOX_SAFE_OPEN_INT_AT(dirfd, STRING_NAME, pathname, flags) {
+	if (FUNCTION_SANDBOX_SAFE_OPEN_INT_AT(dirfd, pathname, flags)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		if (flags & O_CREAT)
diff --git a/libsandbox/wrapper-funcs/opendir.c b/libsandbox/wrapper-funcs/opendir.c
index 4f07d44..46d9e30 100644
--- a/libsandbox/wrapper-funcs/opendir.c
+++ b/libsandbox/wrapper-funcs/opendir.c
@@ -13,7 +13,7 @@ DIR *WRAPPER_NAME(WRAPPER_ARGS)
 {
 	DIR *result = NULL;
 
-	if FUNCTION_SANDBOX_SAFE(STRING_NAME, name) {
+	if (FUNCTION_SANDBOX_SAFE(name)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(name);
diff --git a/libsandbox/wrapper-funcs/rename.c b/libsandbox/wrapper-funcs/rename.c
index f6e3a7b..4ca2c39 100644
--- a/libsandbox/wrapper-funcs/rename.c
+++ b/libsandbox/wrapper-funcs/rename.c
@@ -16,8 +16,9 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if (FUNCTION_SANDBOX_SAFE(STRING_NAME, oldpath) &&
-	    FUNCTION_SANDBOX_SAFE(STRING_NAME, newpath)) {
+	if (FUNCTION_SANDBOX_SAFE(oldpath) &&
+	    FUNCTION_SANDBOX_SAFE(newpath))
+	{
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(oldpath, newpath);
diff --git a/libsandbox/wrapper-funcs/renameat.c b/libsandbox/wrapper-funcs/renameat.c
index 8be54f0..4e6b6e6 100644
--- a/libsandbox/wrapper-funcs/renameat.c
+++ b/libsandbox/wrapper-funcs/renameat.c
@@ -16,8 +16,9 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if (FUNCTION_SANDBOX_SAFE_AT(olddirfd, STRING_NAME, oldpath) &&
-	    FUNCTION_SANDBOX_SAFE_AT(newdirfd, STRING_NAME, newpath)) {
+	if (FUNCTION_SANDBOX_SAFE_AT(olddirfd, oldpath) &&
+	    FUNCTION_SANDBOX_SAFE_AT(newdirfd, newpath))
+	{
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(olddirfd, oldpath, newdirfd, newpath);
diff --git a/libsandbox/wrapper-funcs/rmdir.c b/libsandbox/wrapper-funcs/rmdir.c
index a842fe7..c3fce12 100644
--- a/libsandbox/wrapper-funcs/rmdir.c
+++ b/libsandbox/wrapper-funcs/rmdir.c
@@ -13,7 +13,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE(STRING_NAME, pathname) {
+	if (FUNCTION_SANDBOX_SAFE(pathname)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(pathname);
diff --git a/libsandbox/wrapper-funcs/symlink.c b/libsandbox/wrapper-funcs/symlink.c
index 996bd39..85d9922 100644
--- a/libsandbox/wrapper-funcs/symlink.c
+++ b/libsandbox/wrapper-funcs/symlink.c
@@ -13,7 +13,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE(STRING_NAME, newpath) {
+	if (FUNCTION_SANDBOX_SAFE(newpath)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(oldpath, newpath);
diff --git a/libsandbox/wrapper-funcs/symlinkat.c b/libsandbox/wrapper-funcs/symlinkat.c
index 7a0c18d..4bf390f 100644
--- a/libsandbox/wrapper-funcs/symlinkat.c
+++ b/libsandbox/wrapper-funcs/symlinkat.c
@@ -13,7 +13,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE_AT(newdirfd, STRING_NAME, newpath) {
+	if (FUNCTION_SANDBOX_SAFE_AT(newdirfd, newpath)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(oldpath, newdirfd, newpath);
diff --git a/libsandbox/wrapper-funcs/truncate.c b/libsandbox/wrapper-funcs/truncate.c
index 10a8496..2297daf 100644
--- a/libsandbox/wrapper-funcs/truncate.c
+++ b/libsandbox/wrapper-funcs/truncate.c
@@ -16,7 +16,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE(STRING_NAME, path) {
+	if (FUNCTION_SANDBOX_SAFE(path)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(path, length);
diff --git a/libsandbox/wrapper-funcs/unlink.c b/libsandbox/wrapper-funcs/unlink.c
index 39de69e..a5db943 100644
--- a/libsandbox/wrapper-funcs/unlink.c
+++ b/libsandbox/wrapper-funcs/unlink.c
@@ -29,7 +29,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 	}
 	errno = old_errno;
 
-	if FUNCTION_SANDBOX_SAFE(STRING_NAME, pathname) {
+	if (FUNCTION_SANDBOX_SAFE(pathname)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(pathname);
diff --git a/libsandbox/wrapper-funcs/unlinkat.c b/libsandbox/wrapper-funcs/unlinkat.c
index 7d31e1b..f2980fa 100644
--- a/libsandbox/wrapper-funcs/unlinkat.c
+++ b/libsandbox/wrapper-funcs/unlinkat.c
@@ -29,7 +29,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 	}
 	errno = old_errno;
 
-	if FUNCTION_SANDBOX_SAFE_AT(dirfd, STRING_NAME, pathname) {
+	if (FUNCTION_SANDBOX_SAFE_AT(dirfd, pathname)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(dirfd, pathname, flags);
diff --git a/libsandbox/wrapper-funcs/utime.c b/libsandbox/wrapper-funcs/utime.c
index 7fb8465..e708f9f 100644
--- a/libsandbox/wrapper-funcs/utime.c
+++ b/libsandbox/wrapper-funcs/utime.c
@@ -13,7 +13,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE(STRING_NAME, filename) {
+	if (FUNCTION_SANDBOX_SAFE(filename)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(filename, times);
diff --git a/libsandbox/wrapper-funcs/utimensat.c b/libsandbox/wrapper-funcs/utimensat.c
index 2921fd7..7afad79 100644
--- a/libsandbox/wrapper-funcs/utimensat.c
+++ b/libsandbox/wrapper-funcs/utimensat.c
@@ -13,7 +13,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE_AT(dirfd, STRING_NAME, filename) {
+	if (FUNCTION_SANDBOX_SAFE_AT(dirfd, filename)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(dirfd, filename, times, flags);
diff --git a/libsandbox/wrapper-funcs/utimes.c b/libsandbox/wrapper-funcs/utimes.c
index 83fe7d9..e31b96e 100644
--- a/libsandbox/wrapper-funcs/utimes.c
+++ b/libsandbox/wrapper-funcs/utimes.c
@@ -13,7 +13,7 @@ int WRAPPER_NAME(WRAPPER_ARGS)
 {
 	int result = -1;
 
-	if FUNCTION_SANDBOX_SAFE(STRING_NAME, filename) {
+	if (FUNCTION_SANDBOX_SAFE(filename)) {
 		check_dlsym(WRAPPER_TRUE_NAME, WRAPPER_SYMNAME,
 			    WRAPPER_SYMVER);
 		result = WRAPPER_TRUE_NAME(filename, times);