BUILD : 1.7.19 (1292) BUGS : 776 NOTES : Fixed wrong reply when deleting entries by number (akick, badwords)

git-svn-id: svn://svn.anope.org/anope/trunk@1292 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1010 5417fbe8-f217-4b02-8779-1006273d7864

Changes

@@ -3,6 +3,7 @@ Anope Version  S V N
 08/30 A Added support for channel keys to UnrealIRCd 3.2 SVSJOIN command  [#774]
 08/29 A Session limit exceptions now support IP numbers as hostmask       [#723]
 08/29 A Added InspIRCd11 vIdent support.                                  [#684]
+08/31 F Wrong reply when deleting entries by number (akick, badwords)     [#776]
 06/15 F Non-existing servers being SQUIT'd when they were juped.          [#726]
 06/15 F Back online notice being sent to juped servers.                   [#726]
 06/15 F Not informing opers a SQUIT for a juped server was received.      [#718]

src/core/bs_badwords.c

@@ -279,9 +279,11 @@ int badwords_del_callback(User * u, int num, va_list args)
     BadWord *bw;
     ChannelInfo *ci = va_arg(args, ChannelInfo *);
     int *last = va_arg(args, int *);
+
+    *last = num;
+
     if (num < 1 || num > ci->bwcount)
         return 0;
-    *last = num;
 
     bw = &ci->badwords[num - 1];
     if (bw->word)

src/core/cs_akick.c

@@ -94,9 +94,12 @@ int akick_del_callback(User * u, int num, va_list args)
 {
     ChannelInfo *ci = va_arg(args, ChannelInfo *);
     int *last = va_arg(args, int *);
+
+    *last = num;
+
     if (num < 1 || num > ci->akickcount)
         return 0;
-    *last = num;
+
     return akick_del(u, &ci->akick[num - 1]);
 }
 

src/ircd.c

@@ -1012,9 +1012,9 @@ void pmodule_cmd_ctcp(void (*func) (char *source, char *dest, char *buf))
 void pmodule_cmd_svid_umode(void (*func) (char *nick, time_t ts))
 {
     ircdproto.ircd_cmd_svid_umode = func;
-}
-
-void pmodule_cmd_nc_change(void (*func) (User * u))
+}
+
+void pmodule_cmd_nc_change(void (*func) (User * u))
 {
     ircdproto.ircd_cmd_nc_change = func;
 }

version.log

@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="19"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1291"
+VERSION_BUILD="1292"
 
 # $Log$
 #
+# BUILD : 1.7.19 (1292)
+# BUGS  : 776
+# NOTES : Fixed wrong reply when deleting entries by number (akick, badwords)
+#
 # BUILD : 1.7.19 (1291)
 # BUGS  : 774
 # NOTES : Unreals (3.2) SVSJOIN command now supports channel keys