Fix various compiler warnings.

[irc/rqf/shadowircd.git] / src / chmode.c

diff --git a/src/chmode.c b/src/chmode.c
index 4f50f825705c34ce333d1d99b5d55b9d14a403b4..6c3fc36f3ebb22ebd939ea0729fc97b081b44166 100644 (file)
--- a/src/chmode.c
+++ b/src/chmode.c
@@ -26,14 +26,12 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "common.h"
 #include "hash.h"
 #include "hook.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"            /* captab */
@@ -42,10 +40,8 @@
 #include "whowas.h"
 #include "s_conf.h"            /* ConfigFileEntry, ConfigChannel */
 #include "s_newconf.h"
-#include "event.h"
-#include "memory.h"
-#include "balloc.h"
-#include "s_log.h"
+#include "logger.h"
+#include "chmode.h"
 
 /* bitmasks for error returns, so we send once per call */
 #define SM_ERR_NOTS             0x00000001     /* No TS on channel */
@@ -61,18 +57,12 @@
 #define SM_ERR_RPL_Q            0x00000800
 #define SM_ERR_RPL_F            0x00001000
 
-void set_channel_mode(struct Client *, struct Client *,
-                    struct Channel *, struct membership *, int, const char **);
-
-int add_id(struct Client *source_p, struct Channel *chptr,
-                 const char *banid, rb_dlink_list * list, long mode_type);
-
 static struct ChModeChange mode_changes[BUFSIZE];
 static int mode_count;
 static int mode_limit;
 static int mask_pos;
 
-int
+static int
 get_channel_access(struct Client *source_p, struct membership *msptr)
 {
        if(!MyClient(source_p) || is_chanop(msptr))
@@ -108,7 +98,7 @@ add_id(struct Client *source_p, struct Channel *chptr, const char *banid,
                        return 0;
                }
 
-               DLINK_FOREACH(ptr, list->head)
+               RB_DLINK_FOREACH(ptr, list->head)
                {
                        actualBan = ptr->data;
                        if(mask_match(actualBan->banstr, realban))
@@ -118,7 +108,7 @@ add_id(struct Client *source_p, struct Channel *chptr, const char *banid,
        /* dont let remotes set duplicates */
        else
        {
-               DLINK_FOREACH(ptr, list->head)
+               RB_DLINK_FOREACH(ptr, list->head)
                {
                        actualBan = ptr->data;
                        if(!irccmp(actualBan->banstr, realban))
@@ -130,10 +120,10 @@ add_id(struct Client *source_p, struct Channel *chptr, const char *banid,
        if(IsPerson(source_p))
                rb_sprintf(who, "%s!%s@%s", source_p->name, source_p->username, source_p->host);
        else
-               strlcpy(who, source_p->name, sizeof(who));
+               rb_strlcpy(who, source_p->name, sizeof(who));
 
        actualBan = allocate_ban(realban, who);
-       actualBan->when = CurrentTime;
+       actualBan->when = rb_current_time();
 
        rb_dlinkAdd(actualBan, &actualBan->node, list);
 
@@ -159,7 +149,7 @@ del_id(struct Channel *chptr, const char *banid, rb_dlink_list * list, long mode
        if(EmptyString(banid))
                return 0;
 
-       DLINK_FOREACH(ptr, list->head)
+       RB_DLINK_FOREACH(ptr, list->head)
        {
                banptr = ptr->data;
 
@@ -580,7 +570,7 @@ chm_ban(struct Client *source_p, struct Channel *chptr,
                        return;
                }
 
-               DLINK_FOREACH(ptr, list->head)
+               RB_DLINK_FOREACH(ptr, list->head)
                {
                        banptr = ptr->data;
                        sendto_one(source_p, form_str(rpl_list),
@@ -1039,7 +1029,7 @@ chm_forward(struct Client *source_p, struct Channel *chptr,
                        }
                }
 
-               strlcpy(chptr->mode.forward, forward, sizeof(chptr->mode.forward));
+               rb_strlcpy(chptr->mode.forward, forward, sizeof(chptr->mode.forward));
 
                mode_changes[mode_count].letter = c;
                mode_changes[mode_count].dir = MODE_ADD;
@@ -1099,7 +1089,7 @@ chm_key(struct Client *source_p, struct Channel *chptr,
                        return;
 
                s_assert(key[0] != ' ');
-               strlcpy(chptr->mode.key, key, sizeof(chptr->mode.key));
+               rb_strlcpy(chptr->mode.key, key, sizeof(chptr->mode.key));
 
                mode_changes[mode_count].letter = c;
                mode_changes[mode_count].dir = MODE_ADD;