hookmacros.h: Minor style fix.

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

diff --git a/src/hookmacros.h b/src/hookmacros.h
index 35e64703ddcc1933891ea8645d155c6edea9282f..b5e2cb0b1fdb93d7ab95cb58012b6d5177ec3a00 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;
@@ -56,10 +56,10 @@
 
 #define _HOOK_PRE(type, name) \
         int handle; \
-        if (!(real_ ## name )) { \
+        if (unlikely(!(real_ ## name ))) { \
             *(void **) (&(real_ ## name)) = dlsym_function(#name); \
             /* Initialize our data while we're at it. */ \
-            if (!initialized) { \
+            if (unlikely(!initialized)) { \
                 init_from_environment(); \
             } \
         }
@@ -68,42 +68,42 @@
         _HOOK_PRE_FD_(type, name, fd)
 #define _HOOK_PRE_FD_(type, name, fd) \
         _HOOK_PRE(type, name) \
-        if (tracked_fds_find(fd)) { \
-            if (force_write_to_non_tty) { \
+        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; \
         } \
-        if (handle) { \
+        if (unlikely(handle)) { \
             handle_fd_pre(fd); \
         }
 #define _HOOK_PRE_FILE(type, name, file) \
         type result; \
         _HOOK_PRE(type, name) \
-        if (tracked_fds_find(fileno(file))) { \
-            if (force_write_to_non_tty) { \
+        if (unlikely(tracked_fds_find(fileno(file)))) { \
+            if (unlikely(force_write_to_non_tty)) { \
                 handle = 1; \
             } else { \
-                handle = isatty(fileno(file)); \
+                handle = isatty_noinline(fileno(file)); \
             } \
         } else { \
             handle = 0; \
         } \
-        if (handle) { \
+        if (unlikely(handle)) { \
             handle_file_pre(file); \
         }
 #define _HOOK_POST_FD_(fd) \
-        if (handle) { \
+        if (unlikely(handle)) { \
             handle_fd_post(fd); \
         }
 #define _HOOK_POST_FD(fd) \
         _HOOK_POST_FD_(fd) \
         return result;
 #define _HOOK_POST_FILE(file) \
-        if (handle) { \
+        if (unlikely(handle)) { \
             handle_file_post(file); \
         } \
         return result;
@@ -176,8 +176,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); \