Fixing time_t warnings

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

diff --git a/src/chmode.c b/src/chmode.c
index 4f50f825705c34ce333d1d99b5d55b9d14a403b4..81c4202abbb226765e94a763f45c76539b6fb238 100644 (file)
--- a/src/chmode.c
+++ b/src/chmode.c
@@ -26,7 +26,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "common.h"
@@ -42,10 +41,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 */
@@ -108,7 +105,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 +115,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))
@@ -133,7 +130,7 @@ add_id(struct Client *source_p, struct Channel *chptr, const char *banid,
                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 +156,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 +577,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),