Introduce generic STRINGIFY and STRINGIFY_VAL macros

* macros.h (STRINGIFY, STRINGIFY_VAL): New macros.
* mpers_type.h: Include "macros.h".
[IN_MPERS] (STRINGIFY): Remove.
* tests/sockname.c (TEST_SYSCALL_STR__, TEST_SYSCALL_STR_): Remove.
(TEST_SYSCALL_STR): Use STRINGIFY_VAL.

Co-authored-by: Victor Krapivensky <krapivenskiy.va@phystech.edu>

diff --git a/macros.h b/macros.h
index 218b057223cf2f669d71ffdcd1d26e0137816237..2913d60c9014a5f041dca6b1752e5fa07c385ed3 100644 (file)
--- a/macros.h
+++ b/macros.h
@@ -32,4 +32,7 @@
 
 #define ARRAY_SIZE(a_) (sizeof(a_) / sizeof((a_)[0]) + MUST_BE_ARRAY(a_))
 
+#define STRINGIFY(...)         #__VA_ARGS__
+#define STRINGIFY_VAL(...)     STRINGIFY(__VA_ARGS__)
+
 #endif /* !STRACE_MACROS_H */

diff --git a/mpers_type.h b/mpers_type.h
index ecb1efa876752dc56b2961acf24334daf20fe3ba..64201c7886d3783640e6c84909795f5a3da58888 100644 (file)
--- a/mpers_type.h
+++ b/mpers_type.h
@@ -30,8 +30,9 @@
 #ifndef STRACE_MPERS_TYPE_H
 #define STRACE_MPERS_TYPE_H
 
+#include "macros.h"
+
 #ifdef IN_MPERS
-# define STRINGIFY(a) #a
 # define DEF_MPERS_TYPE(args) STRINGIFY(args.h)
 # ifdef MPERS_IS_m32
 #  define MPERS_PREFIX m32_

diff --git a/tests/sockname.c b/tests/sockname.c
index 9bab8eda0691a8e8ad83af9db8d154502105d788..587267120bdc78ca1bb31b9a5c77b15c80318531 100644 (file)
--- a/tests/sockname.c
+++ b/tests/sockname.c
@@ -42,9 +42,7 @@
 # error TEST_SYSCALL_NAME must be defined
 #endif
 
-#define TEST_SYSCALL_STR__(a) #a
-#define TEST_SYSCALL_STR_(a) TEST_SYSCALL_STR__(a)
-#define TEST_SYSCALL_STR TEST_SYSCALL_STR_(TEST_SYSCALL_NAME)
+#define TEST_SYSCALL_STR STRINGIFY_VAL(TEST_SYSCALL_NAME)
 #define TEST_SOCKET TEST_SYSCALL_STR ".socket"
 
 #ifdef TEST_SYSCALL_PREPARE