BUILD : 1.7.21 (1356) BUGS : 835 NOTES : Fixed channel walking for do_mass_mode() and restore_unsynced_topics() to use firstchan/nextchan

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


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

3 files changed, 20 insertions, 20 deletions

diff --git a/Changes b/Changes
index f8a15b0ef..f889149b5 100644
--- a/Changes
+++ b/Changes
@@ -8,6 +8,7 @@ Anope Version  S V N
 01/24 F Several language errors.                                          [ #00]
 01/26 F Various oddities in moduleAddData().                              [#833]
 01/26 F Various oddities in ChanServ suspend code.                        [#834]
+01/26 F Channel walking for mass modes and restoring topics.              [#835]
 
 Provided by Jan Milants <jan_renee@msn.com> - 2008
 01/16 F Server traversion with next_server() failed to list all servers.  [#831]
diff --git a/src/channels.c b/src/channels.c
index 37ecf0210..c10096e96 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -697,7 +697,7 @@ void do_part(const char *source, int ac, char **av)
             }
             channame = sstrdup(c->chan->name);
             send_event(EVENT_PART_CHANNEL, (ac >= 2 ? 4 : 3), EVENT_START,
-                       user->nick, 
channame, (ac >= 2 ? av[1] : ""));
+                       user->nick, channame, (ac >= 2 ? av[1] : ""));
 
             chan_deluser(user, c->chan);
             if (c->next)
@@ -709,7 +709,7 @@ void do_part(const char *source, int ac, char **av)
             free(c);
 
             send_event(EVENT_PART_CHANNEL, (ac >= 2 ? 4 : 3), EVENT_STOP,
-                       user->nick, 
channame, (ac >= 2 ? av[1] : ""));
+                       user->nick, channame, (ac >= 2 ? av[1] : ""));
             free(channame);
         }
     }
@@ -1884,7 +1884,7 @@ void set_redirect(Channel * chan, char *value)
 
 void do_mass_mode(char *modes)
 {
-    int ac, i;
+    int ac;
     char **av;
     Channel *c;
     char *myModes;
@@ -1897,16 +1897,14 @@ void do_mass_mode(char *modes)
     myModes = sstrdup(modes);
     ac = split_buf(myModes, &av, 1);
 
-    for (i = 0; i < 1024; i++) {
-        for (c = chanlist[i]; c; c = c->next) {
-            if (c->bouncy_modes) {
-                free(av);
-                free(myModes);
-                return;
-            } else {
-                anope_cmd_mode(s_OperServ, c->name, "%s", modes);
-                chan_set_modes(s_OperServ, c, ac, av, 1);
-            }
+    for (c = firstchan(); c; c = nextchan()) {
+        if (c->bouncy_modes) {
+            free(av);
+            free(myModes);
+            return;
+        } else {
+            anope_cmd_mode(s_OperServ, c->name, "%s", modes);
+            chan_set_modes(s_OperServ, c, ac, av, 1);
         }
     }
     free(av);
@@ -1918,13 +1916,10 @@ void do_mass_mode(char *modes)
 void restore_unsynced_topics(void)
 {
     Channel *c;
-    int i;
 
-    for (i = 0; i < 1024; i++) {
-        for (c = chanlist[i]; c; c = c->next) {
-            if (!(c->topic_sync))
-                restore_topic(c->name);
-        }
+    for (c = firstchan(); c; c = nextchan()) {
+        if (!(c->topic_sync))
+            restore_topic(c->name);
     }
 }
 
diff --git a/version.log b/version.log
index a63769556..166ee6567 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="21"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1355"
+VERSION_BUILD="1356"
 
 # $Log$
 #
+# BUILD : 1.7.21 (1356)
+# BUGS  : 835
+# NOTES : Fixed channel walking for do_mass_mode() and restore_unsynced_topics() to use firstchan/nextchan
+#
 # BUILD : 1.7.21 (1355)
 # BUGS  : 834
 # NOTES : Fixed various oddities in ChanServ suspend code