CHANSERV: remove E type escapes

[irc/quakenet/newserv.git] / helpmod2 / hqueue.c

diff --git a/helpmod2/hqueue.c b/helpmod2/hqueue.c
index 808507214d2e73ad974aa4b42a05f86fda094728..9ab9d2175011c49e50b5b10c5d2d3cf1179f3ab5 100644 (file)
--- a/helpmod2/hqueue.c
+++ b/helpmod2/hqueue.c
@@ -107,6 +107,9 @@ void hqueue_advance(hchannel *hchan, huser *oper, int nadv)
     char buffer[512];
     int counter = nadv;
     huser_channel *huserchan;
+
+    if (hchan == NULL) return;
+
     hchannel_user *hchanuser = hchan->channel_users;
 
     buffer[0] = '\0';
@@ -228,7 +231,7 @@ void helpmod_queue_handler (huser *sender, channel* returntype, hchannel *hchan,
             int i;
             if (argc == 0)
             {
-                helpmod_reply(sender, returntype, "Can not advance queue: User not specified", hchannel_get_name(hchan));
+                helpmod_reply(sender, returntype, "Can not advance queue: User not specified");
                 return;
             }
             if (argc > H_CMD_MAX_ARGS)
@@ -255,7 +258,7 @@ void helpmod_queue_handler (huser *sender, channel* returntype, hchannel *hchan,
             {
                 if (!sscanf(argv[0], "%d", &nnext) || nnext <= 0 || nnext > 25 /* magic number */)
                 {
-                    helpmod_reply(sender, returntype, "Can not advance queue: Integer [1, 25] expected", hchannel_get_name(hchan));
+                    helpmod_reply(sender, returntype, "Can not advance queue: Integer [1, 25] expected");
                     return;
                 }
             }
@@ -272,7 +275,7 @@ void helpmod_queue_handler (huser *sender, channel* returntype, hchannel *hchan,
             }
             if (!sscanf(argv[0], "%d", &tmp) || tmp < 0 || tmp > 25)
             {
-                helpmod_reply(sender, returntype, "Can not set auto queue: Integer [0, 20] expected", hchannel_get_name(hchan));
+                helpmod_reply(sender, returntype, "Can not set auto queue: Integer [0, 20] expected");
                 return;
             }
             hchan->autoqueue = tmp;