*/
#include "config.h"
-#if 0
-/*
- * No need to include handlers.h here the signatures must match
- * and we don't need to force a rebuild of all the handlers everytime
- * we add a new one to the list. --Bleep
- */
-#include "handlers.h"
-#endif /* 0 */
#include "channel.h"
#include "client.h"
#include "hash.h"
#include "ircd.h"
+#include "ircd_log.h"
#include "ircd_reply.h"
#include "ircd_string.h"
#include "msg.h"
#include "numnicks.h"
#include "send.h"
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
/*
* ms_end_of_burst - server message handler
/* Count through channels... */
for (chan = GlobalChannelList; chan; chan = next_chan) {
next_chan = chan->next;
-
- if (!chan->members) { /* empty channel */
- if (!(chan->mode.mode & MODE_BURSTADDED))
- sendto_opmask_butone(0, SNO_OLDSNO, "Empty channel %H not added by "
- "BURST!", chan);
-
- sub1_from_channel(chan); /* ok, nuke channel now */
- }
-
- chan->mode.mode &= ~MODE_BURSTADDED;
+ if (!chan->members && (chan->mode.mode & MODE_BURSTADDED)) {
+ /* Newly empty channel, schedule it for removal. */
+ chan->mode.mode &= ~MODE_BURSTADDED;
+ sub1_from_channel(chan);
+ } else
+ chan->mode.mode &= ~MODE_BURSTADDED;
}
return 0;