Rename `rule_reinit' to `rule_end' for more sensible restart. Don't try

to trace when tracing's turned off.

diff --git a/src/rule.c b/src/rule.c
index 41fa3712b61af60269a54f77888baffaac1ac280..b77cd14b049cf62979e01f9aa79a49f034575c8a 100644 (file)
--- a/src/rule.c
+++ b/src/rule.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
 /* -*-c-*-
  *

- * $Id: rule.c,v 1.2 1997/08/04 10:24:25 mdw Exp $
+ * $Id: rule.c,v 1.3 1997/08/20 16:22:36 mdw Exp $

  *
  * Managing rule sets
  *
  *
  * Managing rule sets
  *


@@ -29,6 +29,10 @@
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: rule.c,v $
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: rule.c,v $

+ * Revision 1.3  1997/08/20 16:22:36  mdw
+ * Rename `rule_reinit' to `rule_end' for more sensible restart.  Don't try
+ * to trace when tracing's turned off.
+ *

  * Revision 1.2  1997/08/04 10:24:25  mdw
  * Sources placed under CVS control.
  *
  * Revision 1.2  1997/08/04 10:24:25  mdw
  * Sources placed under CVS control.
  *


@@ -96,27 +100,29 @@ void rule_init(void)
   rule__tail = (rule *)&rule__list;
 }
 
   rule__tail = (rule *)&rule__list;
 }
 

-/* --- @rule_reinit@ --- *
+/* --- @rule_end@ --- *

  *
  * Arguments:  ---
  *
  * Returns:    ---
  *
  *
  * Arguments:  ---
  *
  * Returns:    ---
  *

- * Use:                Reinitialises the rule database.
+ * Use:                Empties the rule database.

  */
 
  */
 

-void rule_reinit(void)
+void rule_end(void)

 {
   rule *r = rule__list;
   rule *rr;
 
   while (r) {
     rr = r->next;
 {
   rule *r = rule__list;
   rule *rr;
 
   while (r) {
     rr = r->next;

+    class_dec(r->host);
+    class_dec(r->from);
+    class_dec(r->to);
+    class_dec(r->cmd);

     free(r);
     r = rr;
   }
     free(r);
     r = rr;
   }

-
-  rule_init();

 }
 
 /* --- @rule_add@ --- *
 }
 
 /* --- @rule_add@ --- *


@@ -214,6 +220,7 @@ int rule_check(request *r)
 
 void rule_dump(void)
 {
 
 void rule_dump(void)
 {

+#ifdef TRACING

   rule *rr = rule__list;
 
   trace(TRACE_RULE, "rule: dumping rules");
   rule *rr = rule__list;
 
   trace(TRACE_RULE, "rule: dumping rules");


@@ -226,6 +233,7 @@ void rule_dump(void)
     rr = rr->next;
   }
   trace(TRACE_RULE, "rule: dump finished");
     rr = rr->next;
   }
   trace(TRACE_RULE, "rule: dump finished");

+#endif

 }
 
 /*----- That's all, folks -------------------------------------------------*/
 }
 
 /*----- That's all, folks -------------------------------------------------*/