From: wessels <>
Date: Sat, 5 Dec 1998 14:17:06 +0000 (+0000)
Subject: configured_once cleanup
X-Git-Tag: SQUID_3_0_PRE1~2479
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3cc5715b671d365a9bcc61b914ec2d2ef8760423;p=thirdparty%2Fsquid.git

configured_once cleanup
---

diff --git a/src/globals.h b/src/globals.h
index 60ffd97229..994d513115 100644
--- 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 671e05ce6a..543c2f95ee 100644
--- 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)