Couple of srvx updates.

[irc/evilnet/x3.git] / src / shun.c

diff --git a/src/shun.c b/src/shun.c
index cdc30c6b0b244a594705d078adcc11f67fba55b9..61bed7f176c554aa69468cc6b7dcba5f9b17ff02 100644 (file)
--- a/src/shun.c
+++ b/src/shun.c
@@ -3,9 +3,9 @@
  *
  * This file is part of x3.
  *
- * srvx is free software; you can redistribute it and/or modify
+ * x3 is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -122,12 +122,6 @@ shun_remove(const char *target, int announce)
             timeq_add(new_first->expires, shun_expire, 0);
         }
     }
-#ifdef WITH_PROTOCOL_BAHAMUT
-    /* Bahamut is sort of lame: It permanently remembers any AKILLs
-     * with durations longer than a day, and will never auto-expire
-     * them.  So when the time comes, we'd better remind it.  */
-    announce = 1;
-#endif
     if (announce)
         irc_unshun(target);
     return res;
@@ -304,7 +298,7 @@ shun_saxdb_write(struct saxdb_context *ctx)
 }
 
 static void
-shun_db_cleanup(void)
+shun_db_cleanup(UNUSED_ARG(void *extra))
 {
     heap_delete(shun_heap);
     dict_delete(shun_dict);
@@ -317,7 +311,7 @@ shun_init(void)
     shun_dict = dict_new();
     dict_set_free_data(shun_dict, free_shun_from_dict);
     saxdb_register("shun", shun_saxdb_read, shun_saxdb_write);
-    reg_exit_func(shun_db_cleanup);
+    reg_exit_func(shun_db_cleanup, NULL);
 }
 
 struct shun_discrim *
@@ -431,3 +425,4 @@ shun_discrim_search(struct shun_discrim *discrim, shun_search_func gsf, void *da
     heap_remove_pred(shun_heap, shun_search_helper, &search);
     return search.hits;
 }
+