From cdb16f35bef2e73b52d4ba402d5b07c890d14be8 Mon Sep 17 00:00:00 2001
From: michael <michael@82007160-df01-0410-b94d-b575c5fd34c7>
Date: Sat, 10 Nov 2012 19:27:13 +0000
Subject: - minor MaskItem structure cleanup

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1649 82007160-df01-0410-b94d-b575c5fd34c7
---
 modules/m_dline.c    |  2 +-
 modules/m_gline.c    |  2 +-
 modules/m_kline.c    |  2 +-
 modules/m_resv.c     |  4 ++--
 modules/m_stats.c    | 10 +++++-----
 modules/m_testline.c |  8 ++++----
 modules/m_xline.c    |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'modules')

diff --git a/modules/m_dline.c b/modules/m_dline.c
index 7bc2070..a3b520d 100644
--- a/modules/m_dline.c
+++ b/modules/m_dline.c
@@ -56,7 +56,7 @@ apply_dline(struct Client *source_p, struct MaskItem *conf,
 {
   if (tkline_time)
   {
-    conf->hold = CurrentTime + tkline_time;
+    conf->until = CurrentTime + tkline_time;
     sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
                          "%s added temporary %d min. D-Line for [%s] [%s]",
                          get_oper_name(source_p), tkline_time/60,
diff --git a/modules/m_gline.c b/modules/m_gline.c
index 13d6be2..ea76a4e 100644
--- a/modules/m_gline.c
+++ b/modules/m_gline.c
@@ -70,7 +70,7 @@ set_local_gline(const struct Client *source_p, const char *user,
   conf->host = xstrdup(host);
 
   conf->setat = CurrentTime;
-  conf->hold = CurrentTime + ConfigFileEntry.gline_time;
+  conf->until = CurrentTime + ConfigFileEntry.gline_time;
   SetConfDatabase(conf);
 
   sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
diff --git a/modules/m_kline.c b/modules/m_kline.c
index 7e15935..4b9e573 100644
--- a/modules/m_kline.c
+++ b/modules/m_kline.c
@@ -208,7 +208,7 @@ m_kline_add_kline(struct Client *source_p, struct MaskItem *conf,
 {
   if (tkline_time)
   {
-    conf->hold = CurrentTime + tkline_time;
+    conf->until = CurrentTime + tkline_time;
     sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
                          "%s added temporary %d min. K-Line for [%s@%s] [%s]",
                          get_oper_name(source_p), tkline_time/60,
diff --git a/modules/m_resv.c b/modules/m_resv.c
index 2fcbf88..1cfd0e4 100644
--- a/modules/m_resv.c
+++ b/modules/m_resv.c
@@ -248,7 +248,7 @@ parse_resv(struct Client *source_p, char *name, int tkline_time, char *reason)
       ilog(LOG_TYPE_IRCD, "%s added temporary %d min. RESV for [%s] [%s]",
 	   source_p->name, (int)tkline_time/60,
 	   conf->name, conf->reason);
-      conf->hold = CurrentTime + tkline_time;
+      conf->until = CurrentTime + tkline_time;
     }
     else
     {
@@ -309,7 +309,7 @@ parse_resv(struct Client *source_p, char *name, int tkline_time, char *reason)
       ilog(LOG_TYPE_IRCD, "%s added temporary %d min. RESV for [%s] [%s]",
 	   source_p->name, (int)tkline_time/60,
 	   conf->name, conf->reason);
-      conf->hold = CurrentTime + tkline_time;
+      conf->until = CurrentTime + tkline_time;
     }
     else
     {
diff --git a/modules/m_stats.c b/modules/m_stats.c
index ed75e39..ca70090 100644
--- a/modules/m_stats.c
+++ b/modules/m_stats.c
@@ -411,7 +411,7 @@ stats_deny(struct Client *source_p, int parc, char *parv[])
       conf = arec->conf;
 
       /* dont report a tdline as a dline */
-      if (conf->hold)
+      if (conf->until)
         continue;
 
       sendto_one(source_p, form_str(RPL_STATSDLINE),
@@ -446,7 +446,7 @@ stats_tdeny(struct Client *source_p, int parc, char *parv[])
       conf = arec->conf;
 
       /* dont report a permanent dline as a tdline */
-      if (!conf->hold)
+      if (!conf->until)
         continue;
 
       sendto_one(source_p, form_str(RPL_STATSDLINE),
@@ -790,7 +790,7 @@ report_Klines(struct Client *client_p, int tkline)
 
       conf = arec->conf;
 
-      if (!tkline && conf->hold)
+      if (!tkline && conf->until)
         continue;
 
       if (HasUMode(client_p, UMODE_OPER))
@@ -832,7 +832,7 @@ stats_tklines(struct Client *source_p, int parc, char *parv[])
       return;
 
     /* dont report a permanent kline as a tkline */
-    if (!conf->hold)
+    if (!conf->until)
       return;
 
     sendto_one(source_p, form_str(RPL_STATSKLINE), from,
@@ -872,7 +872,7 @@ stats_klines(struct Client *source_p, int parc, char *parv[])
       return;
 
     /* dont report a tkline as a kline */
-    if (conf->hold)
+    if (conf->until)
       return;
       
     sendto_one(source_p, form_str(RPL_STATSKLINE), from,
diff --git a/modules/m_testline.c b/modules/m_testline.c
index 674f9c7..f22b7b2 100644
--- a/modules/m_testline.c
+++ b/modules/m_testline.c
@@ -121,8 +121,8 @@ mo_testline(struct Client *client_p, struct Client *source_p,
       else
         sendto_one(source_p, form_str(RPL_TESTLINE),
                    me.name, source_p->name,
-                   conf->hold ? 'd' : 'D',
-                   conf->hold ? ((conf->hold - CurrentTime) / 60)
+                   conf->until ? 'd' : 'D',
+                   conf->until ? ((conf->until - CurrentTime) / 60)
                    : 0L,
                    conf->host, conf->reason);
     }
@@ -154,8 +154,8 @@ mo_testline(struct Client *client_p, struct Client *source_p,
     {
       sendto_one(source_p, form_str(RPL_TESTLINE),
                  me.name, source_p->name,
-                 conf->hold ? 'k' : 'K',
-                 conf->hold ? ((conf->hold - CurrentTime) / 60)
+                 conf->until ? 'k' : 'K',
+                 conf->until ? ((conf->until - CurrentTime) / 60)
                  : 0L,
                  userhost, conf->reason? conf->reason : "No reason");
       ++matches;
diff --git a/modules/m_xline.c b/modules/m_xline.c
index 5e079a8..037fc17 100644
--- a/modules/m_xline.c
+++ b/modules/m_xline.c
@@ -352,7 +352,7 @@ write_xline(struct Client *source_p, char *gecos, char *reason,
     ilog(LOG_TYPE_KLINE, "%s added temporary %d min. X-Line for [%s] [%s]",
 	 source_p->name, (int)tkline_time/60,
 	 conf->name, conf->reason);
-    conf->hold = CurrentTime + tkline_time;
+    conf->until = CurrentTime + tkline_time;
   }
   else
   {
-- 
cgit