removed some unused variables

[srvx.git] / src / spamserv.c

diff --git a/src/spamserv.c b/src/spamserv.c
index 9987398772bc4c98737380d9e018fa9b569f37c0..97f4b7ea3264d1946ed6c705ea040e29b2ddf1af 100644 (file)
--- a/src/spamserv.c
+++ b/src/spamserv.c
@@ -76,7 +76,7 @@ dict_t connected_users_dict;
 dict_t killed_users_dict;
 
 #define spamserv_notice(target, format...) send_message(target , spamserv , ## format)
-#define spamserv_debug(format...) do { if(spamserv_conf.debug_channel) send_channel_notice(spamserv_conf.debug_channel , spamserv , ## format); } while(0)
+#define spamserv_debug(format...) do { if(spamserv_conf.debug_channel) send_channel_message(spamserv_conf.debug_channel , spamserv , ## format); } while(0)
 #define ss_reply(format...)    send_message(user , spamserv , ## format)
 
 #define SET_SUBCMDS_SIZE 10
@@ -2193,14 +2193,14 @@ spamserv_saxdb_read_shitlist(const char *name, void *data, void *extra)
 static int
 spamserv_saxdb_read(struct dict *database)
 {
-       dict_iterator_t it, itbad;
-       struct dict *object, *badwords;
-       struct record_data *hir, hirbad;
+       dict_iterator_t it;
+       struct dict *badwords;
+       struct record_data *hir;
        struct chanNode *channel;
        struct chanInfo *cInfo;
        struct string_list *strlist;
-       unsigned int flags,exceptlevel,badwordid,action,triggered;
-       char *str, *info, *mask;
+       unsigned int flags,exceptlevel,badwordid;
+       char *str, *info;
        unsigned long expiry;    
 
        for(it = dict_first(database); it; it = iter_next(it))
@@ -2247,7 +2247,7 @@ spamserv_saxdb_read(struct dict *database)
                 badwordid = str ? atoi(str) : 0;
                 cInfo->last_badword_id = badwordid;
                 if ((badwords = database_get_data(hir->d.object, KEY_BADWORDS, RECDB_OBJECT)))
-                       dict_foreach(object, spamserv_saxdb_read_shitlist, cInfo);
+                       dict_foreach(badwords, spamserv_saxdb_read_shitlist, cInfo);
                        }
                }
                else