configured_once cleanup

diff --git a/src/globals.h b/src/globals.h
index 60ffd97229bd01124897f5ea3e850e51d21013ea..994d513115118478fa1ebc0b1b955623b748abd7 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: globals.h,v 1.72 1998/11/25 09:00:21 wessels Exp $
+ * $Id: globals.h,v 1.73 1998/12/05 07:17:07 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -71,7 +71,6 @@ extern int NHttpSockets;      /* 0 */
 extern int RESERVED_FD;
 extern int Squid_MaxFD;                /* SQUID_MAXFD */
 extern int config_lineno;      /* 0 */
-extern int configured_once;    /* 0 */
 extern int debugLevels[MAX_DEBUG_SECTIONS];
 extern int do_mallinfo;                /* 0 */
 extern int opt_reuseaddr;      /* 1 */

diff --git a/src/main.cc b/src/main.cc
index 671e05ce6a4210a65615605b908dc92932d5cf8e..543c2f95ee382dec1df28d2e49d81e2d1f0ca36a 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.279 1998/11/25 09:00:22 wessels Exp $
+ * $Id: main.cc,v 1.280 1998/12/05 07:17:06 wessels Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -526,10 +526,9 @@ main(int argc, char **argv)
        int parse_err;
        if (!ConfigFile)
            ConfigFile = xstrdup(DefaultConfigFile);
-       if (!configured_once) { /* is it ever false? */
-           cbdataInit();
-           memInit();          /* memInit is required for config parsing */
-       }
+       assert(!configured_once);
+       cbdataInit();
+       memInit();              /* memInit is required for config parsing */
        parse_err = parseConfigFile(ConfigFile);
 
        if (opt_parse_cfg_only)