Couple of srvx updates.

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

diff --git a/src/helpfile.c b/src/helpfile.c
index 144a7bcfe9e83c82f7a82aed7a0448c41e917148..91e8f2891c543b46d093b2d6be6794efa59c565d 100644 (file)
--- a/src/helpfile.c
+++ b/src/helpfile.c
@@ -48,7 +48,7 @@ struct userNode *message_source;
 struct language *lang_C;
 struct dict *languages;
 
-static void language_cleanup(void)
+static void language_cleanup(UNUSED_ARG(void *extra))
 {
     dict_delete(languages);
 }
@@ -248,7 +248,7 @@ static void language_read_list(void)
             continue;
         }
         if (!dict_find(languages, dirent->d_name, NULL))
-        language_alloc(dirent->d_name);
+            language_alloc(dirent->d_name);
     }
     closedir(dir);
 }
@@ -675,7 +675,7 @@ vsend_message(const char *dest, struct userNode *src, struct handle_info *handle
                 break;
             default:
                 value = "";
-                log_module(MAIN_LOG, LOG_ERROR, "Invalid exp.type %d from expansion function %p.", exp.type, expand_f);
+                log_module(MAIN_LOG, LOG_ERROR, "Invalid exp.type %d from expansion function %p.", exp.type, (void*)expand_f);
                 break;
             }
             ipos = name_end - input.list;
@@ -1192,5 +1192,5 @@ static void helpfile_read_languages(void)
 void helpfile_finalize(void)
 {
     conf_register_reload(helpfile_read_languages);
-    reg_exit_func(language_cleanup);
+    reg_exit_func(language_cleanup, NULL);
 }