fix possible crash on user deletion

[srvx.git] / src / helpfile.h

diff --git a/src/helpfile.h b/src/helpfile.h
index cf0ea6e267f7a719cc011e95c9cfef7c606e29a4..435f5b4ddf69449f9502c37e3d886306feea5698 100644 (file)
--- a/src/helpfile.h
+++ b/src/helpfile.h
@@ -29,8 +29,8 @@ struct string_list;
 
 extern struct userNode *message_dest; /* message destination; useful in expansion callbacks */
 
-#define MIN_LINE_SIZE          40
-#define MAX_LINE_SIZE          450
+#define MIN_LINE_SIZE       40
+#define MAX_LINE_SIZE       450
 
 #define TABLE_REPEAT_HEADERS 0x0001 /* repeat the headers for each columnset? */
 #define TABLE_PAD_LEFT       0x0002 /* pad cells on the left? */
@@ -72,6 +72,12 @@ struct language
 extern struct language *lang_C;
 extern struct dict *languages;
 
+#define MSG_TYPE_NOTICE    0
+#define MSG_TYPE_PRIVMSG   1
+#define MSG_TYPE_WALLCHOPS 2
+#define MSG_TYPE_NOXLATE   4
+#define MSG_TYPE_MULTILINE 8
+
 int send_message(struct userNode *dest, struct userNode *src, const char *message, ...);
 int send_message_type(int msg_type, struct userNode *dest, struct userNode *src, const char *message, ...);
 int send_target_message(int msg_type, const char *dest, struct userNode *src, const char *format, ...);
@@ -80,9 +86,15 @@ int send_help(struct userNode *dest, struct userNode *src, struct helpfile *hf,
  * irc_send is either irc_privmsg or irc_notice; NULL means figure it out. */
 void table_send(struct userNode *from, const char *to, unsigned int size, irc_send_func irc_send, struct helpfile_table table);
 
-#define send_channel_message(CHANNEL, ARGS...) send_target_message(5, (CHANNEL)->name, ARGS)
-#define send_channel_notice(CHANNEL, ARGS...) send_target_message(4, (CHANNEL)->name, ARGS)
-#define send_channel_wallchops(CHANNEL, ARGS...) send_target_message(6, (CHANNEL)->name, ARGS)
+#if defined(GCC_VARMACROS)
+# define send_channel_message(CHANNEL, ARGS...) send_target_message(5, (CHANNEL)->name, ARGS)
+# define send_channel_notice(CHANNEL, ARGS...) send_target_message(4, (CHANNEL)->name, ARGS)
+# define send_channel_wallchops(CHANNEL, ARGS...) send_target_message(6, (CHANNEL)->name, ARGS)
+#elif defined(C99_VARMACROS)
+# define send_channel_message(CHANNEL, ...) send_target_message(5, (CHANNEL)->name, __VA_ARGS__)
+# define send_channel_notice(CHANNEL, ...) send_target_message(4, (CHANNEL)->name, __VA_ARGS__)
+# define send_channel_wallchops(CHANNEL, ...) send_target_message(6, (CHANNEL)->name, __VA_ARGS__)
+#endif
 
 struct message_entry
 {
@@ -95,6 +107,7 @@ const char *language_find_message(struct language *lang, const char *msgid);
 #define handle_find_message(HANDLE, MSGID) language_find_message((HANDLE) ? (HANDLE)->language : lang_C, (MSGID))
 #define user_find_message(USER, MSGID) language_find_message((USER)->handle_info ? (USER)->handle_info->language : lang_C, (MSGID))
 void helpfile_init(void);
+void helpfile_finalize(void);
 
 struct helpfile *open_helpfile(const char *fname, expand_func_t expand);
 void close_helpfile(struct helpfile *hf);