Merge pull request #10675 from rakhmets/topic/rm-extra-macro-param

UCM/UTIL: Removed unused macro parameter.

Author: yosefe

src/ucm/util/replace.c

@@ -59,26 +59,27 @@ UCM_DEFINE_REPLACE_FUNC(sbrk,    void*, MAP_FAILED, intptr_t)
 UCM_DEFINE_REPLACE_FUNC(brk,     int,   -1,         void*)
 UCM_DEFINE_REPLACE_FUNC(madvise, int,   -1,         void*, size_t, int)
 
-UCM_DEFINE_SELECT_FUNC(mmap, void*, MAP_FAILED, SYS_mmap, void*, size_t, int, int, int, off_t)
-UCM_DEFINE_SELECT_FUNC(munmap, int, -1, SYS_munmap, void*, size_t)
+UCM_DEFINE_SELECT_FUNC(mmap, void*, SYS_mmap, void*, size_t, int, int, int,
+                       off_t)
+UCM_DEFINE_SELECT_FUNC(munmap, int, SYS_munmap, void*, size_t)
 #if HAVE_MREMAP
-UCM_DEFINE_SELECT_FUNC(mremap, void*, MAP_FAILED, SYS_mremap, void*, size_t,
-                       size_t, int, void*)
+UCM_DEFINE_SELECT_FUNC(mremap, void*, SYS_mremap, void*, size_t, size_t, int,
+                       void*)
 #endif
-UCM_DEFINE_SELECT_FUNC(madvise, int, -1, SYS_madvise, void*, size_t, int)
+UCM_DEFINE_SELECT_FUNC(madvise, int, SYS_madvise, void*, size_t, int)
 
 #if UCM_BISTRO_HOOKS
 #if HAVE_DECL_SYS_SHMAT
 
-UCM_DEFINE_SELECT_FUNC(shmat, void*, MAP_FAILED, SYS_shmat, int, const void*, int)
+UCM_DEFINE_SELECT_FUNC(shmat, void*, SYS_shmat, int, const void*, int)
 
 #elif HAVE_DECL_SYS_IPC
 #  ifndef IPCOP_shmat
 #    define IPCOP_shmat 21
 #  endif
 
-_UCM_DEFINE_DLSYM_FUNC(shmat, ucm_orig_dlsym_shmat, ucm_override_shmat,
-                       void*, MAP_FAILED, int, const void*, int)
+_UCM_DEFINE_DLSYM_FUNC(shmat, ucm_orig_dlsym_shmat, ucm_override_shmat, void*,
+                       int, const void*, int)
 
 void *ucm_orig_shmat(int shmid, const void *shmaddr, int shmflg)
 {
@@ -99,15 +100,15 @@ void *ucm_orig_shmat(int shmid, const void *shmaddr, int shmflg)
 
 #if HAVE_DECL_SYS_SHMDT
 
-UCM_DEFINE_SELECT_FUNC(shmdt, int, -1, SYS_shmdt, const void*)
+UCM_DEFINE_SELECT_FUNC(shmdt, int, SYS_shmdt, const void*)
 
 #elif HAVE_DECL_SYS_IPC
 #  ifndef IPCOP_shmdt
 #    define IPCOP_shmdt 22
 #  endif
 
-_UCM_DEFINE_DLSYM_FUNC(shmdt, ucm_orig_dlsym_shmdt, ucm_override_shmdt,
-                       int, -1, const void*)
+_UCM_DEFINE_DLSYM_FUNC(shmdt, ucm_orig_dlsym_shmdt, ucm_override_shmdt, int,
+                       const void*)
 
 int ucm_orig_shmdt(const void *shmaddr)
 {
@@ -121,7 +122,7 @@ int ucm_orig_shmdt(const void *shmaddr)
 
 #endif
 
-_UCM_DEFINE_DLSYM_FUNC(brk, ucm_orig_dlsym_brk, ucm_override_brk, int, -1, void*)
+_UCM_DEFINE_DLSYM_FUNC(brk, ucm_orig_dlsym_brk, ucm_override_brk, int, void*)
 
 int ucm_orig_brk(void *addr)
 {
@@ -140,8 +141,8 @@ int ucm_orig_brk(void *addr)
     }
 }
 
-_UCM_DEFINE_DLSYM_FUNC(sbrk, ucm_orig_dlsym_sbrk, ucm_override_sbrk,
-                       void*, MAP_FAILED, intptr_t)
+_UCM_DEFINE_DLSYM_FUNC(sbrk, ucm_orig_dlsym_sbrk, ucm_override_sbrk, void*,
+                       intptr_t)
 
 void *ucm_orig_sbrk(intptr_t increment)
 {
@@ -158,10 +159,10 @@ void *ucm_orig_sbrk(intptr_t increment)
 
 #else /* UCM_BISTRO_HOOKS */
 
-UCM_DEFINE_DLSYM_FUNC(brk, int, -1, void*)
-UCM_DEFINE_DLSYM_FUNC(sbrk, void*, MAP_FAILED, intptr_t)
-UCM_DEFINE_DLSYM_FUNC(shmat, void*, MAP_FAILED, int, const void*, int)
-UCM_DEFINE_DLSYM_FUNC(shmdt, int, -1, const void*)
+UCM_DEFINE_DLSYM_FUNC(brk, int, void*)
+UCM_DEFINE_DLSYM_FUNC(sbrk, void*, intptr_t)
+UCM_DEFINE_DLSYM_FUNC(shmat, void*, int, const void*, int)
+UCM_DEFINE_DLSYM_FUNC(shmdt, int, const void*)
 
 #endif /* UCM_BISTRO_HOOKS */
 

src/ucm/util/replace.h

@@ -44,11 +44,11 @@ extern pthread_t volatile ucm_reloc_get_orig_thread;
         return res; \
     }
 
-#define UCM_DEFINE_DLSYM_FUNC(_name, _rettype, _fail_val, ...) \
+#define UCM_DEFINE_DLSYM_FUNC(_name, _rettype, ...) \
     _UCM_DEFINE_DLSYM_FUNC(_name, ucm_orig_##_name, ucm_override_##_name, \
-                          _rettype, _fail_val, __VA_ARGS__)
+                           _rettype, __VA_ARGS__)
 
-#define _UCM_DEFINE_DLSYM_FUNC(_name, _orig_name, _over_name, _rettype, _fail_val, ...) \
+#define _UCM_DEFINE_DLSYM_FUNC(_name, _orig_name, _over_name, _rettype, ...) \
     _rettype _over_name(UCM_FUNC_DEFINE_ARGS(__VA_ARGS__)); \
     \
     /* Call the original function using dlsym(RTLD_NEXT) */ \
@@ -72,7 +72,7 @@ extern pthread_t volatile ucm_reloc_get_orig_thread;
 
 #define UCM_DEFINE_REPLACE_DLSYM_FUNC(_name, _rettype, _fail_val, ...) \
     _UCM_DEFINE_DLSYM_FUNC(_name, ucm_orig_##_name, ucm_override_##_name, \
-                          _rettype, _fail_val, __VA_ARGS__) \
+                           _rettype, __VA_ARGS__) \
     _UCM_DEFINE_REPLACE_FUNC(ucm_override_##_name, ucm_##_name, \
                              _rettype, _fail_val, __VA_ARGS__)
 
@@ -85,8 +85,7 @@ extern pthread_t volatile ucm_reloc_get_orig_thread;
  */
 #define UCM_DEFINE_REPLACE_DLSYM_PTR_FUNC(_name, _rettype, _fail_val, ...) \
     _UCM_DEFINE_DLSYM_FUNC(_name, ucm_orig_##_name##_dlsym, \
-                           ucm_override_##_name, _rettype, _fail_val, \
-                           __VA_ARGS__) \
+                           ucm_override_##_name, _rettype, __VA_ARGS__) \
     \
     _rettype (*ucm_orig_##_name)(UCM_FUNC_DEFINE_ARGS(__VA_ARGS__)) = \
         ucm_orig_##_name##_dlsym; \
@@ -102,9 +101,9 @@ extern pthread_t volatile ucm_reloc_get_orig_thread;
     }
 
 #if UCM_BISTRO_HOOKS
-#  define UCM_DEFINE_SELECT_FUNC(_name, _rettype, _fail_val, _syscall_id, ...) \
-    _UCM_DEFINE_DLSYM_FUNC(_name, ucm_orig_##_name##_dlsym, ucm_override_##_name, \
-                          _rettype, _fail_val, __VA_ARGS__) \
+#  define UCM_DEFINE_SELECT_FUNC(_name, _rettype, _syscall_id, ...) \
+    _UCM_DEFINE_DLSYM_FUNC(_name, ucm_orig_##_name##_dlsym, \
+                           ucm_override_##_name, _rettype, __VA_ARGS__) \
     UCM_DEFINE_SYSCALL_FUNC(_name##_syscall, _rettype, _syscall_id, __VA_ARGS__) \
     _rettype ucm_orig_##_name(UCM_FUNC_DEFINE_ARGS(__VA_ARGS__)) \
     { \
@@ -113,8 +112,8 @@ extern pthread_t volatile ucm_reloc_get_orig_thread;
                ucm_orig_##_name##_dlsym(UCM_FUNC_PASS_ARGS(__VA_ARGS__)); \
     }
 #else
-#  define UCM_DEFINE_SELECT_FUNC(_name, _rettype, _fail_val, _syscall_id, ...) \
-    UCM_DEFINE_DLSYM_FUNC(_name, _rettype, _fail_val, __VA_ARGS__)
+#  define UCM_DEFINE_SELECT_FUNC(_name, _rettype, _syscall_id, ...) \
+    UCM_DEFINE_DLSYM_FUNC(_name, _rettype, __VA_ARGS__)
 #endif
 
 /*