Added type-checking for the addHookPre() and addHookPost() macros

- The macros will now throw a warning at compile time if a plugin is
  using a wrong function type for a pre or post hook. This avoids some
  very subtle, hard to detect, issues.
- The macros now require 3 arguments instead of 2. Example:
  old code: addHookPre("ifname->function" my_hook);
  becomes:  addHookPre(ifname, function, my_hook);

Signed-off-by: Haru <haru@dotalux.com>

1 files changed, 12 insertions, 2 deletions

diff --git a/src/plugins/HPMHooking.h b/src/plugins/HPMHooking.h
index b2d95dd8d..44970863c 100644
--- a/src/plugins/HPMHooking.h
+++ b/src/plugins/HPMHooking.h
@@ -43,8 +43,18 @@ struct HPMHooking_core_interface {
 #else // ! HERCULES_CORE
 HPExport struct HPMHooking_interface HPMHooking_s;
 
-#define addHookPre(tname,hook) (HPMi->hooking->AddHook(HOOK_TYPE_PRE,(tname),(hook),HPMi->pid))
-#define addHookPost(tname,hook) (HPMi->hooking->AddHook(HOOK_TYPE_POST,(tname),(hook),HPMi->pid))
+#include "HPMHooking/HPMHooking.Defs.inc"
+
+#define addHookPre(ifname, funcname, hook) ( \
+		(void)((HPMHOOK_pre_ ## ifname ## _ ## funcname)0 == (hook)), \
+		HPMi->hooking->AddHook(HOOK_TYPE_PRE, #ifname "->" #funcname, (hook), HPMi->pid) \
+		)
+
+#define addHookPost(ifname, funcname, hook) ( \
+		(void)((HPMHOOK_post_ ## ifname ## _ ## funcname)0 == (hook)), \
+		HPMi->hooking->AddHook(HOOK_TYPE_POST, #ifname "->" #funcname, (hook), HPMi->pid) \
+		)
+
 /* need better names ;/ */
 /* will not run the original function after pre-hook processing is complete (other hooks will run) */
 #define hookStop() (HPMi->hooking->HookStop(__func__,HPMi->pid))