Define real_*() static variables with macros.

[coloredstderr/coloredstderr.git] / src / hookmacros.h

diff --git a/src/hookmacros.h b/src/hookmacros.h
index 0eb47cd67abd45451dc85b02e0573a7e04119ced..ebd5f7a80cdf4127da5a241fad99c6f466f5a8ea 100644 (file)
--- a/src/hookmacros.h
+++ b/src/hookmacros.h
@@ -38,7 +38,7 @@
  *         if (force_write_to_non_tty) {
  *             handle = 1;
  *         } else {
- *             handle = isatty(<fd>);
+ *             handle = isatty_noinline(<fd>);
  *         }
  *     } else {
  *         handle = 0;
@@ -54,7 +54,7 @@
  *     return result;
  */
 
-#define _HOOK_PRE(type, name) \
+#define _HOOK_PRE(type, name, fd) \
         int handle; \
         if (unlikely(!(real_ ## name ))) { \
             *(void **) (&(real_ ## name)) = dlsym_function(#name); \
@@ -62,36 +62,28 @@
             if (unlikely(!initialized)) { \
                 init_from_environment(); \
             } \
-        }
-#define _HOOK_PRE_FD(type, name, fd) \
-        type result; \
-        _HOOK_PRE_FD_(type, name, fd)
-#define _HOOK_PRE_FD_(type, name, fd) \
-        _HOOK_PRE(type, name) \
+        } \
+        /* Check if this fd should be handled. */ \
         if (unlikely(tracked_fds_find(fd))) { \
             if (unlikely(force_write_to_non_tty)) { \
                 handle = 1; \
             } else { \
-                handle = isatty(fd); \
+                handle = isatty_noinline(fd); \
             } \
         } else { \
             handle = 0; \
-        } \
+        }
+#define _HOOK_PRE_FD(type, name, fd) \
+        type result; \
+        _HOOK_PRE_FD_(type, name, fd)
+#define _HOOK_PRE_FD_(type, name, fd) \
+        _HOOK_PRE(type, name, fd) \
         if (unlikely(handle)) { \
             handle_fd_pre(fd); \
         }
 #define _HOOK_PRE_FILE(type, name, file) \
         type result; \
-        _HOOK_PRE(type, name) \
-        if (unlikely(tracked_fds_find(fileno(file)))) { \
-            if (unlikely(force_write_to_non_tty)) { \
-                handle = 1; \
-            } else { \
-                handle = isatty(fileno(file)); \
-            } \
-        } else { \
-            handle = 0; \
-        } \
+        _HOOK_PRE(type, name, fileno(file)) \
         if (unlikely(handle)) { \
             handle_file_pre(file); \
         }
@@ -109,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) { \
@@ -117,6 +123,13 @@
         _HOOK_POST_FD_(fd) \
     }
 
+#define HOOK_FD2(type, name, fd, type1, arg1, type2, arg2) \
+    static type (*real_ ## name)(type1, type2); \
+    type name(type1 arg1, type2 arg2) { \
+        _HOOK_PRE_FD(type, name, fd) \
+        result = real_ ## name(arg1, arg2); \
+        _HOOK_POST_FD(fd) \
+    }
 #define HOOK_FD3(type, name, fd, type1, arg1, type2, arg2, type3, arg3) \
     static type (*real_ ## name)(type1, type2, type3); \
     type name(type1 arg1, type2 arg2, type3 arg3) { \
@@ -176,8 +189,7 @@
     }
 #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, ...) \
-    { \
+    type name(type1 arg1, type2 arg2, type3 arg3, ...) { \
         va_list ap; \
         _HOOK_PRE_FILE(type, func, file) \
         va_start(ap, arg3); \