X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fhookmacros.h;h=469886978e3a6048d8943f92f7a516c6bc7be4ae;hb=fe3f7d4c635b265c58efd5bc420d32135ec7903e;hp=09e718a594f05216fb0034286ebb493ccdbd42cb;hpb=73870d5ed5fc275c462eefff724e3b26502ce26a;p=coloredstderr%2Fcoloredstderr.git

diff --git a/src/hookmacros.h b/src/hookmacros.h
index 09e718a..4698869 100644
--- a/src/hookmacros.h
+++ b/src/hookmacros.h
@@ -26,6 +26,7 @@
 
 #define _HOOK_PRE(type, name) \
         int handle; \
+        int saved_errno = errno; \
         DLSYM_FUNCTION(real_ ## name, #name);
 #define _HOOK_PRE_FD(type, name, fd) \
         type result; \
@@ -34,21 +35,23 @@
         _HOOK_PRE(type, name) \
         handle = check_handle_fd(fd); \
         if (handle) { \
-            handle_fd_pre(fd, handle); \
-        }
+            handle_fd_pre(fd); \
+        } \
+        errno = saved_errno;
 #define _HOOK_PRE_FILE(type, name, file) \
         type result; \
         _HOOK_PRE(type, name) \
         handle = check_handle_fd(fileno(file)); \
         if (handle) { \
-            handle_file_pre(file, handle); \
-        }
+            handle_file_pre(file); \
+        } \
+        errno = saved_errno;
 /* Save and restore the errno to make sure we return the errno of the original
  * function call. */
 #define _HOOK_POST_FD_(fd) \
         if (handle) { \
-            int saved_errno = errno; \
-            handle_fd_post(fd, handle); \
+            saved_errno = errno; \
+            handle_fd_post(fd); \
             errno = saved_errno; \
         }
 #define _HOOK_POST_FD(fd) \
@@ -56,8 +59,8 @@
         return result;
 #define _HOOK_POST_FILE(file) \
         if (handle) { \
-            int saved_errno = errno; \
-            handle_file_post(file, handle); \
+            saved_errno = errno; \
+            handle_file_post(file); \
             errno = saved_errno; \
         } \
         return result;