[asterisk-commits] jpeeler: branch group/multiparking r113979 - /team/group/multiparking/channels/

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed Apr  9 17:01:18 2008
New Revision: 113979

URL: http://svn.digium.com/view/asterisk?view=rev&rev=113979
Log:
move parsing for parkinglot from config file to occur at a file independent location

Modified:
    team/group/multiparking/channels/chan_zap.c

Modified: team/group/multiparking/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/group/multiparking/channels/chan_zap.c?view=diff&rev=113979&r1=113978&r2=113979
==============================================================================
--- team/group/multiparking/channels/chan_zap.c (original)
+++ team/group/multiparking/channels/chan_zap.c Wed Apr  9 17:01:18 2008
@@ -13224,11 +13224,10 @@
 		if (!ast_jb_read_conf(&global_jbconf, v->name, v->value))
 			continue;
 
-		/* TODO: jpeeler
+		/* TODO: jpeeler - better placement? (will parse any valid file here) */
 		if (!strcasecmp(v->name, "parkinglot")) {
 			ast_copy_string(confp->chan.parkinglot, v->value, sizeof(confp->chan.parkinglot));
 		}
-		*/
 
 		/* Create the interface list */
 		if (!strcasecmp(v->name, "channel")
@@ -14025,7 +14024,6 @@
 	struct ast_flags config_flags = { reload == 1 ? CONFIG_FLAG_FILEUNCHANGED : 0 };
 	const char *cat;
 	int res;
-	const char *parkinglot = NULL;
 
 #ifdef HAVE_PRI
 	char *c;
@@ -14121,11 +14119,6 @@
 
 	mwimonitornotify[0] = '\0';
 
-	/* TODO jpeeler: better placement? */
-	if ((parkinglot = ast_variable_retrieve(cfg, "channels", "parkinglot"))) {
-		ast_copy_string(base_conf.chan.parkinglot, parkinglot, sizeof(base_conf.chan.parkinglot));
-	}
-
 	v = ast_variable_browse(cfg, "channels");
 	if ((res = process_zap(&base_conf, v, reload, 0))) {
 		ast_mutex_unlock(&iflock);