Fix for "whats the color" 8ball question formats

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

diff --git a/src/helpfile.c b/src/helpfile.c
index 862624bffcb20fbb3d929dbf78a05d24f6c2b247..caee9765ee4d0d4ead8b4b784da4d9d6c300e50a 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);
 }
@@ -454,7 +454,7 @@ vsend_message(const char *dest, struct userNode *src, struct handle_info *handle
     void (*irc_send)(struct userNode *from, const char *to, const char *msg);
     static struct string_buffer input;
     unsigned int size, ipos, pos, length, chars_sent, use_color;
-    unsigned int expand_pos, expand_ipos, newline_ipos;
+    unsigned int expand_ipos, newline_ipos;
     char line[MAX_LINE_SIZE];
     struct service *service;
     static char* trigger = NULL;
@@ -513,7 +513,7 @@ vsend_message(const char *dest, struct userNode *src, struct handle_info *handle
      * that requires a very big intermediate buffer.
      */
     expand_ipos = newline_ipos = ipos = 0;
-    expand_pos = pos = 0;
+    pos = 0;
     chars_sent = 0;
     while (input.list[ipos]) {
        char ch, *value = NULL, *free_value;
@@ -730,12 +730,10 @@ vsend_message(const char *dest, struct userNode *src, struct handle_info *handle
             free(free_value);
        pos += length;
         if ((pos < size-1) && input.list[ipos]) {
-            expand_pos = pos;
             expand_ipos = ipos;
             continue;
         }
       send_line:
-        expand_pos = pos;
         expand_ipos = ipos;
         SEND_LINE(0);
 #undef SEND_LINE
@@ -1192,5 +1190,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);
 }