From: Simon Ruderich Date: Fri, 14 Jun 2013 23:58:36 +0000 (+0200) Subject: Use locally defined functions in hooks where possible. X-Git-Tag: 0.1~41 X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=0a909cac79e9d46ad6470b9deab9df9493f66a69;p=coloredstderr%2Fcoloredstderr.git Use locally defined functions in hooks where possible. Don't create a hook and call the "real" function when it's enough to call an existing hook for this function. --- diff --git a/src/hookmacros.h b/src/hookmacros.h index ebd5f7a..9ee05db 100644 --- a/src/hookmacros.h +++ b/src/hookmacros.h @@ -168,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