- Remove unused temporary_resv list. Move channel_resv_list to conf.c

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@2173 82007160-df01-0410-b94d-b575c5fd34c7

6 files changed, 12 insertions, 15 deletions

diff --git a/include/conf.h b/include/conf.h
index b96f815..910ed86 100644
--- a/include/conf.h
+++ b/include/conf.h
@@ -330,6 +330,8 @@ extern dlink_list xconf_items;
 extern dlink_list uconf_items;
 extern dlink_list oconf_items;
 extern dlink_list service_items;
+extern dlink_list nresv_items;
+extern dlink_list cresv_items;
 extern struct conf_parser_context conf_parser_ctx;
 extern struct logging_entry ConfigLoggingEntry;
 extern struct config_file_entry ConfigFileEntry;/* defined in ircd.c*/
diff --git a/include/resv.h b/include/resv.h
index 8d4a6a0..0d472b1 100644
--- a/include/resv.h
+++ b/include/resv.h
@@ -25,9 +25,6 @@
 #ifndef INCLUDED_resv_h
 #define INCLUDED_resv_h
 
-extern dlink_list nresv_items;
-extern dlink_list resv_channel_list;
-
 extern struct MaskItem *create_resv(const char *, const char *, const dlink_list *);
 extern int resv_find_exempt(const struct Client *, const struct MaskItem *);
 extern struct MaskItem *match_find_resv(const char *);
diff --git a/modules/m_stats.c b/modules/m_stats.c
index b6724e8..9d8474c 100644
--- a/modules/m_stats.c
+++ b/modules/m_stats.c
@@ -219,7 +219,7 @@ report_resv(struct Client *source_p)
   dlink_node *ptr = NULL;
   struct MaskItem *conf = NULL;
 
-  DLINK_FOREACH(ptr, resv_channel_list.head)
+  DLINK_FOREACH(ptr, cresv_items.head)
   {
     conf = ptr->data;
     sendto_one(source_p, form_str(RPL_STATSQLINE),
@@ -476,8 +476,8 @@ stats_memory(struct Client *source_p, int parc, char *parv[])
 
   sendto_one(source_p, ":%s %d %s z :Resv channels %u(%lu) nicks %u(%lu)",
              me.name, RPL_STATSDEBUG, source_p->name,
-             dlink_list_length(&resv_channel_list),
-             dlink_list_length(&resv_channel_list) * sizeof(struct MaskItem),
+             dlink_list_length(&cresv_items),
+             dlink_list_length(&cresv_items) * sizeof(struct MaskItem),
              dlink_list_length(&nresv_items),
              dlink_list_length(&nresv_items) * sizeof(struct MaskItem));
 
diff --git a/src/conf.c b/src/conf.c
index db4b225..ec946fe 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -65,7 +65,7 @@ dlink_list oconf_items   = { NULL, NULL, 0 };
 dlink_list uconf_items   = { NULL, NULL, 0 };
 dlink_list xconf_items   = { NULL, NULL, 0 };
 dlink_list nresv_items   = { NULL, NULL, 0 };
-dlink_list temporary_resv = { NULL, NULL, 0 };
+dlink_list cresv_items = { NULL, NULL, 0 };
 
 extern unsigned int lineno;
 extern char linebuf[];
@@ -809,7 +809,7 @@ map_to_list(enum maskitem_type type)
     return(&nresv_items);
     break;
   case CONF_CRESV:
-    return(&resv_channel_list);
+    return(&cresv_items);
   case CONF_OPER:
     return(&oconf_items);
     break;
@@ -1327,7 +1327,7 @@ cleanup_tklines(void *notused)
   hostmask_expire_temporary();
   expire_tklines(&xconf_items); 
   expire_tklines(&nresv_items);
-  expire_tklines(&resv_channel_list);
+  expire_tklines(&cresv_items);
 }
 
 /* expire_tklines()
@@ -1542,7 +1542,7 @@ clear_out_old_conf(void)
   dlink_list *free_items [] = {
     &server_items,   &oconf_items,
      &uconf_items,   &xconf_items,
-     &nresv_items, &cluster_items,  &service_items, &resv_channel_list, NULL
+     &nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
   };
 
   dlink_list ** iterator = free_items; /* C is dumb */
diff --git a/src/conf_db.c b/src/conf_db.c
index 87b00cd..cbf1770 100644
--- a/src/conf_db.c
+++ b/src/conf_db.c
@@ -831,7 +831,7 @@ save_resv_database(void)
   if (!(f = open_db(RESVPATH, "w", KLINE_DB_VERSION)))
     return;
 
-  DLINK_FOREACH(ptr, resv_channel_list.head)
+  DLINK_FOREACH(ptr, cresv_items.head)
   {
     conf = ptr->data;
 
@@ -849,7 +849,7 @@ save_resv_database(void)
 
   SAFE_WRITE(write_uint32(records, f), RESVPATH);
 
-  DLINK_FOREACH(ptr, resv_channel_list.head)
+  DLINK_FOREACH(ptr, cresv_items.head)
   {
     conf = ptr->data;
 
diff --git a/src/resv.c b/src/resv.c
index 29380b2..6752cf6 100644
--- a/src/resv.c
+++ b/src/resv.c
@@ -39,8 +39,6 @@
 #include "channel.h"
 #include "hostmask.h"
 
-dlink_list resv_channel_list = { NULL, NULL, 0 };
-
 
 /* create_resv()
  *
@@ -176,7 +174,7 @@ match_find_resv(const char *name)
   if (EmptyString(name))
     return NULL;
 
-  DLINK_FOREACH(ptr, resv_channel_list.head)
+  DLINK_FOREACH(ptr, cresv_items.head)
   {
     struct MaskItem *conf = ptr->data;