X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhookmacros.h;h=9ee05dbaeff98aeabdbed00485d108220f3f5efc;hb=1068648718dad86471451266fcdf4248bb79f3fe;hp=42273e4fd3f35c2f7ba1fda7695317b566fb54b3;hpb=0ad5e4db04a913dc8c91167aa138f706fffd311c;p=coloredstderr%2Fcoloredstderr.git

diff --git a/src/hookmacros.h b/src/hookmacros.h
index 42273e4..9ee05db 100644
--- a/src/hookmacros.h
+++ b/src/hookmacros.h
@@ -101,6 +101,20 @@
         return result;
 
 
+#define HOOK_FUNC_DEF1(type, name, type1, arg1) \
+    static type (*real_ ## name)(type1); \
+    type name(type1 arg1)
+#define HOOK_FUNC_DEF2(type, name, type1, arg1, type2, arg2) \
+    static type (*real_ ## name)(type1, type2); \
+    type name(type1 arg1, type2 arg2)
+#define HOOK_FUNC_DEF3(type, name, type1, arg1, type2, arg2, type3, arg3) \
+    static type (*real_ ## name)(type1, type2, type3); \
+    type name(type1 arg1, type2 arg2, type3 arg3)
+
+#define HOOK_FUNC_VAR_DEF2(type, name, type1, arg1, type2, arg2) \
+    static type (*real_ ## name)(type1, type2, ...); \
+    type name(type1 arg1, type2 arg2, ...)
+
 #define HOOK_VOID1(type, name, fd, type1, arg1) \
     static type (*real_ ## name)(type1); \
     type name(type1 arg1) { \
@@ -154,34 +168,28 @@
     }
 
 #define HOOK_VAR_FILE1(type, name, file, func, type1, arg1) \
-    static type (*real_ ## func)(type1, va_list); \
     type name(type1 arg1, ...) { \
         va_list ap; \
-        _HOOK_PRE_FILE(type, func, file) \
         va_start(ap, arg1); \
-        result = real_ ## func(arg1, ap); \
+        type result = func(arg1, ap); \
         va_end(ap); \
-        _HOOK_POST_FILE(file) \
+        return result; \
     }
 #define HOOK_VAR_FILE2(type, name, file, func, type1, arg1, type2, arg2) \
-    static type (*real_ ## func)(type1, type2, va_list); \
     type name(type1 arg1, type2 arg2, ...) { \
         va_list ap; \
-        _HOOK_PRE_FILE(type, func, file) \
         va_start(ap, arg2); \
-        result = real_ ## func(arg1, arg2, ap); \
+        type result = func(arg1, arg2, ap); \
         va_end(ap); \
-        _HOOK_POST_FILE(file) \
+        return result; \
     }
 #define HOOK_VAR_FILE3(type, name, file, func, type1, arg1, type2, arg2, type3, arg3) \
-    static type (*real_ ## func)(type1, type2, type3, va_list); \
     type name(type1 arg1, type2 arg2, type3 arg3, ...) { \
         va_list ap; \
-        _HOOK_PRE_FILE(type, func, file) \
         va_start(ap, arg3); \
-        result = real_ ## func(arg1, arg2, arg3, ap); \
+        type result = func(arg1, arg2, arg3, ap); \
         va_end(ap); \
-        _HOOK_POST_FILE(file) \
+        return result; \
     }
 
 #endif