milestone: added module config names

1 files changed, 0 insertions, 81 deletions

diff --git a/runtime/conf.c b/runtime/conf.c
index 27077ea9..1757c944 100644
--- a/runtime/conf.c
+++ b/runtime/conf.c
@@ -812,87 +812,6 @@ rsRetVal cflineDoAction(rsconf_t *conf, uchar **p, action_t **ppAction)
 }
 
 
-#if 0
-/* Process a configuration file line in traditional "filter selector" format
- * or one that builds upon this format. Note that ppRule may be a NULL pointer,
- * which is valid and happens if there is no previous line (right at the start
- * of the master config file!).
- */
-static rsRetVal
-cflineClassic(rsconf_t *conf, uchar *p, rule_t **ppRule)
-{
-	DEFiRet;
-	action_t *pAction;
-
-	/* lines starting with '&' have no new filters and just add
-	 * new actions to the currently processed selector.
-	 */
-	if(*p == '&') {
-		++p; /* eat '&' */
-		skipWhiteSpace(&p); /* on to command */
-	} else {
-		/* we are finished with the current selector (on previous line).
-		 * So we now need to check
-		 * if it has any actions associated and, if so, link it to the linked
-		 * list. If it has nothing associated with it, we can simply discard
-		 * it. In any case, we create a fresh selector for our new filter.
-		 * We have one special case during initialization: then, the current
-		 * selector is NULL, which means we do not need to care about it at
-		 * all.  -- rgerhards, 2007-08-01
-		 */
-		if(*ppRule != NULL) {
-			CHKiRet(ruleset.AddRule(conf, rule.GetAssRuleset(*ppRule), ppRule));
-		}
-		CHKiRet(rule.Construct(ppRule)); /* create "fresh" selector */
-		CHKiRet(rule.SetAssRuleset(*ppRule, ruleset.GetCurrent(conf))); /* create "fresh" selector */
-		CHKiRet(rule.ConstructFinalize(*ppRule)); /* create "fresh" selector */
-		CHKiRet(cflineDoFilter(&p, *ppRule)); /* pull filters */
-	}
-
-	CHKiRet(cflineDoAction(conf, &p, &pAction));
-	CHKiRet(llAppend(&(*ppRule)->llActList,  NULL, (void*) pAction));
-
-finalize_it:
-	RETiRet;
-}
-
-
-/* process a configuration line
- * I re-did this functon because it was desperately time to do so
- * rgerhards, 2007-08-01
- */
-static rsRetVal
-cfline(rsconf_t *conf, uchar *line, rule_t **pfCurr)
-{
-	DEFiRet;
-
-	ASSERT(line != NULL);
-
-	dbgprintf("cfline: '%s'\n", line);
-
-	/* check type of line and call respective processing */
-	switch(*line) {
-		case '!':
-			iRet = cflineProcessTagSelector(&line);
-			break;
-		case '+':
-		case '-':
-			iRet = cflineProcessHostSelector(&line);
-			break;
-		case '$':
-			++line; /* eat '$' */
-			iRet = cfsysline(line);
-			break;
-		default:
-			iRet = cflineClassic(conf, line, pfCurr);
-			break;
-	}
-
-	RETiRet;
-}
-#endif
-
-
 /* return the current number of active actions
  * rgerhards, 2008-07-28
  */