add extra parameter to part_func

[irc/evilnet/x3.git] / src / mod-snoop.c

diff --git a/src/mod-snoop.c b/src/mod-snoop.c
index 7288da13ea12e9fc05ff3bc87e62f3deb1714e6b..6b1f198f5bcb3f490e1d7d17af0cd0cec0d01694 100644 (file)
--- a/src/mod-snoop.c
+++ b/src/mod-snoop.c
@@ -55,18 +55,22 @@ const char *snoop_module_deps[] = { NULL };
 static int finalized;
 int snoop_finalize(void);
 
-#define SNOOP(FORMAT, ARGS...) send_channel_message(snoop_cfg.channel, snoop_cfg.bot, "%s "FORMAT, timestamp , ## ARGS)
+#if defined(GCC_VARMACROS)
+# define SNOOP(FORMAT, ARGS...) send_channel_message(snoop_cfg.channel, snoop_cfg.bot, "%s "FORMAT, timestamp, ARGS)
+#elif defined(C99_VARMACROS)
+# define SNOOP(FORMAT, ...) send_channel_message(snoop_cfg.channel, snoop_cfg.bot, "%s "FORMAT, timestamp, __VA_ARGS__)
+#endif
 #define UPDATE_TIMESTAMP() strftime(timestamp, sizeof(timestamp), "[%H:%M:%S]", localtime(&now))
 
 static void
-snoop_nick_change(struct userNode *user, const char *old_nick) {
+snoop_nick_change(struct userNode *user, const char *old_nick, UNUSED_ARG(void *extra)) {
     if (!snoop_cfg.enabled) return;
     UPDATE_TIMESTAMP();
     SNOOP("$bNICK$b change %s -> %s", old_nick, user->nick);
 }
 
 static int
-snoop_join(struct modeNode *mNode) {
+snoop_join(struct modeNode *mNode, UNUSED_ARG(void *extra)) {
     struct userNode *user = mNode->user;
     struct chanNode *chan = mNode->channel;
     if (!snoop_cfg.enabled) return 0;
@@ -81,7 +85,7 @@ snoop_join(struct modeNode *mNode) {
 }
 
 static void
-snoop_part(struct modeNode *mn, const char *reason) {
+snoop_part(struct modeNode *mn, const char *reason, UNUSED_ARG(void *extra)) {
     if (!snoop_cfg.enabled) return;
     if (mn->user->dead) return;
     UPDATE_TIMESTAMP();
@@ -96,7 +100,7 @@ snoop_kick(struct userNode *kicker, struct userNode *victim, struct chanNode *ch
 }
 
 static int
-snoop_new_user(struct userNode *user) {
+snoop_new_user(struct userNode *user, UNUSED_ARG(void *extra)) {
     if (!snoop_cfg.enabled) return 0;
     if (user->uplink->burst && !snoop_cfg.show_bursts) return 0;
     UPDATE_TIMESTAMP();
@@ -105,7 +109,7 @@ snoop_new_user(struct userNode *user) {
 }
 
 static void
-snoop_del_user(struct userNode *user, struct userNode *killer, const char *why) {
+snoop_del_user(struct userNode *user, struct userNode *killer, const char *why, UNUSED_ARG(void *extra)) {
     if (!snoop_cfg.enabled) return;
     UPDATE_TIMESTAMP();
     if (killer) {
@@ -138,7 +142,7 @@ snoop_user_mode(struct userNode *user, const char *mode_change) {
 }
 
 static void
-snoop_oper(struct userNode *user) {
+snoop_oper(struct userNode *user, UNUSED_ARG(void *extra)) {
     if (!snoop_cfg.enabled) return;
     if (user->uplink->burst && !snoop_cfg.show_bursts) return;
     UPDATE_TIMESTAMP();
@@ -243,6 +247,19 @@ snoop_channel_mode(struct userNode *who, struct chanNode *channel, char **modes,
                                                        tg = tmp;
                                                break;
                                        }
+                               case 'h':
+                                       {
+                                               strcat(targets, " ");
+                                               if ((tmp = strchr(tg, ' ')))
+                                                       *tmp++ = 0;
+                                               if((un = GetUserN(tg)))
+                                                       strcat(targets, un->nick);
+                                               else
+                                                       strcat(targets, tg);
+                                               if(tmp)
+                                                       tg = tmp;
+                                               break;
+                                       }
                                case 'v':
                                        {
                                                strcat(targets, " ");
@@ -290,23 +307,23 @@ snoop_conf_read(void) {
 void
 snoop_cleanup(void) {
     snoop_cfg.enabled = 0;
-    unreg_del_user_func(snoop_del_user);
+    unreg_del_user_func(snoop_del_user, NULL);
 }
 
 int
 snoop_init(void) {
     reg_exit_func(snoop_cleanup);
     conf_register_reload(snoop_conf_read);
-    reg_nick_change_func(snoop_nick_change);
-    reg_join_func(snoop_join);
-    reg_part_func(snoop_part);
+    reg_nick_change_func(snoop_nick_change, NULL);
+    reg_join_func(snoop_join, NULL);
+    reg_part_func(snoop_part, NULL);
     reg_kick_func(snoop_kick);
-    reg_new_user_func(snoop_new_user);
-    reg_del_user_func(snoop_del_user);
+    reg_new_user_func(snoop_new_user, NULL);
+    reg_del_user_func(snoop_del_user, NULL);
     reg_auth_func(snoop_auth);
     reg_channel_mode_func(snoop_channel_mode);
     reg_user_mode_func(snoop_user_mode);
-    reg_oper_func(snoop_oper);
+    reg_oper_func(snoop_oper, NULL);
 
     return 1;
 }