From 4ccf24c096073e9ef1681faf8c459474d6e584c2 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 19 Oct 2009 10:17:24 +0200
Subject: cleanup: finally moved some config variables just to conf.c

---
 runtime/conf.c  | 22 +++++++++++++++-------
 runtime/conf.h  |  4 ----
 tools/syslogd.c | 16 ----------------
 3 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/runtime/conf.c b/runtime/conf.c
index 2e37edf2..d1b14793 100644
--- a/runtime/conf.c
+++ b/runtime/conf.c
@@ -95,17 +95,16 @@ DEFobjCurrIf(ruleset)
 
 static int iNbrActions = 0; /* number of currently defined actions */
 
-/* The following global variables are used for building
+/* The following module-global variables are used for building
  * tag and host selector lines during startup and config reload.
  * This is stored as a global variable pool because of its ease. It is
  * also fairly compatible with multi-threading as the stratup code must
- * be run in a single thread anyways. So there can be no race conditions. These
- * variables are no longer used once the configuration has been loaded (except,
- * of course, during a reload). rgerhards 2005-10-18
+ * be run in a single thread anyways. So there can be no race conditions.
+ * rgerhards 2005-10-18
  */
-EHostnameCmpMode eDfltHostnameCmpMode;
-cstr_t *pDfltHostnameCmp;
-cstr_t *pDfltProgNameCmp;
+static EHostnameCmpMode eDfltHostnameCmpMode = HN_NO_COMP;
+static cstr_t *pDfltHostnameCmp = NULL;
+static cstr_t *pDfltProgNameCmp = NULL;
 
 
 /* process a directory and include all of its files into
@@ -1248,6 +1247,15 @@ ENDobjQueryInterface(conf)
  */
 BEGINObjClassExit(conf, OBJ_IS_CORE_MODULE) /* CHANGE class also in END MACRO! */
 CODESTARTObjClassExit(conf)
+	/* free no-longer needed module-global variables */
+	if(pDfltHostnameCmp != NULL) {
+		rsCStrDestruct(&pDfltHostnameCmp);
+	}
+
+	if(pDfltProgNameCmp != NULL) {
+		rsCStrDestruct(&pDfltProgNameCmp);
+	}
+
 	/* release objects we no longer need */
 	objRelease(expr, CORE_COMPONENT);
 	objRelease(ctok, CORE_COMPONENT);
diff --git a/runtime/conf.h b/runtime/conf.h
index 6db1623e..d85d1f82 100644
--- a/runtime/conf.h
+++ b/runtime/conf.h
@@ -49,10 +49,6 @@ ENDinterface(conf)
 PROTOTYPEObj(conf);
 
 
-/* TODO: remove them below (means move the config init code) -- rgerhards, 2008-02-19 */
-extern EHostnameCmpMode eDfltHostnameCmpMode;
-extern cstr_t *pDfltHostnameCmp;
-extern cstr_t *pDfltProgNameCmp;
 /* TODO: the following 2 need to go in conf obj interface... */
 rsRetVal cflineParseTemplateName(uchar** pp, omodStringRequest_t *pOMSR, int iEntry, int iTplOpts, uchar *dfltTplName);
 rsRetVal cflineParseFileName(uchar* p, uchar *pFileName, omodStringRequest_t *pOMSR, int iEntry, int iTplOpts, uchar *pszTpl);
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 99ccd1f1..7945ec55 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -1888,11 +1888,6 @@ init(void)
 	struct sigaction sigAct;
 	DEFiRet;
 
-	/* initialize some static variables */
-	pDfltHostnameCmp = NULL;
-	pDfltProgNameCmp = NULL;
-	eDfltHostnameCmpMode = HN_NO_COMP;
-
 	DBGPRINTF("rsyslog %s - called init()\n", VERSION);
 
 	/* construct the default ruleset */
@@ -1942,17 +1937,6 @@ init(void)
 
 	legacyOptsHook();
 
-	/* we are now done with reading the configuration. This is the right time to
-	 * free some objects that were just needed for loading it. rgerhards 2005-10-19
-	 */
-	if(pDfltHostnameCmp != NULL) {
-		rsCStrDestruct(&pDfltHostnameCmp);
-	}
-
-	if(pDfltProgNameCmp != NULL) {
-		rsCStrDestruct(&pDfltProgNameCmp);
-	}
-
 	/* some checks */
 	if(iMainMsgQueueNumWorkers < 1) {
 		errmsg.LogError(0, NO_ERRCODE, "$MainMsgQueueNumWorkers must be at least 1! Set to 1.\n");
-- 
cgit