X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fhookmacros.h;h=f2a1fe89508d3b037b90e04e0e7a219985daf5b5;hb=3773b830ba1eae6e912e06290f291b0052e85ad8;hp=6f65d1e8e84ae86cd8974aea29fba3487201edd7;hpb=66140e14e485af27f5234ae7b744a50dff3dd4c9;p=coloredstderr%2Fcoloredstderr.git diff --git a/src/hookmacros.h b/src/hookmacros.h index 6f65d1e..f2a1fe8 100644 --- a/src/hookmacros.h +++ b/src/hookmacros.h @@ -26,7 +26,6 @@ #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; \ @@ -35,33 +34,25 @@ _HOOK_PRE(type, name) \ handle = check_handle_fd(fd); \ if (handle) { \ - handle_fd_pre(fd, handle); \ - } \ - errno = saved_errno; + handle_fd_pre(fd); \ + } #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); \ - } \ - errno = saved_errno; -/* Save and restore the errno to make sure we return the errno of the original - * function call. */ + handle_file_pre(file); \ + } #define _HOOK_POST_FD_(fd) \ if (handle) { \ - saved_errno = errno; \ - handle_fd_post(fd, handle); \ - errno = saved_errno; \ + handle_fd_post(fd); \ } #define _HOOK_POST_FD(fd) \ _HOOK_POST_FD_(fd) \ return result; #define _HOOK_POST_FILE(file) \ if (handle) { \ - saved_errno = errno; \ - handle_file_post(file, handle); \ - errno = saved_errno; \ + handle_file_post(file); \ } \ return result;