Author: Kev <klmitch@mit.edu>

Log message:

some misc. cleanups to nuke compile warnings/errors so it'll compile
cleanly--sorry, guys.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@81 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index d3fc7c2eae0af37bd90aaada6ebc3cf6f785b855..580f1edfd8edbcef8293b1c947aedd58060c33f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2000-03-27  Kevin L. Mitchell  <klmitch@emc.com>
 
-       * ircd/m_clearmode.c: add msg.h to includes...
+       * ircd/m_clearmode.c: add msg.h to includes; other misc cleanups
+       to make it all compile
 
        * ircd/m_opmode.c: add msg.h to includes...
 
@@ -70,7 +71,7 @@
 #
 # ChangeLog for ircu2.10.11
 #
-# $Id: ChangeLog,v 1.31 2000-03-27 21:04:57 kev Exp $
+# $Id: ChangeLog,v 1.32 2000-03-27 21:16:56 kev Exp $
 #
 # Insert new changes at beginning of the change list.
 #

diff --git a/ircd/channel.c b/ircd/channel.c
index f83f1bef7c8dfd528b139a0644746b47232afc0d..06ceff78ad046dd7cdc6d3905c155c3c1f9dd6fb 100644 (file)
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -2747,11 +2747,11 @@ build_string(char *strptr, int *strptr_i, char *str1, char *str2)
 {
   strptr[(*strptr_i)++] = ' ';
 
-  while (strptr[(*strptr_i)++] = *(str1++))
+  while ((strptr[(*strptr_i)++] = *(str1++)))
     ; /* very simple strcat */
 
   if (str2)
-    while (strptr[(*strptr_i)++] = *(str2++))
+    while ((strptr[(*strptr_i)++] = *(str2++)))
       ; /* for the two-argument form--used for numeric nicks */
 }
 

diff --git a/ircd/m_clearmode.c b/ircd/m_clearmode.c
index 05d5c115dac6aeef1f5e5f74fd57d9e8b7309416..53cbc12c21f234ff8806cadd040be71421f2ef81 100644 (file)
--- a/ircd/m_clearmode.c
+++ b/ircd/m_clearmode.c
@@ -92,8 +92,10 @@
 #include "channel.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_alloc.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
+#include "list.h"
 #include "msg.h"
 #include "numeric.h"
 #include "numnicks.h"
@@ -158,7 +160,7 @@ do_clearmode(struct Client *cptr, struct Client *sptr, struct Channel *chptr,
   chptr->mode.mode &= ~del_mode; /* and of course actually delete them */
 
   /* If we're removing invite, remove all the invites */
-  if (del_mode & MODE_INVITE)
+  if (del_mode & MODE_INVITEONLY)
     while ((link = chptr->invites))
       del_invite(link->value.cptr, chptr);
 
@@ -243,6 +245,8 @@ do_clearmode(struct Client *cptr, struct Client *sptr, struct Channel *chptr,
   else
     sendto_serv_butone(cptr, "%s%s " TOK_CLEARMODE " %s %s", NumNick(sptr),
                       chptr->chname, control_buf);
+
+  return 0;
 }
 
 /*