[asterisk-commits] markster: branch markster/usersconf r41811 - /team/markster/usersconf/pbx/

[asterisk-commits at lists.digium.com]

Author: markster
Date: Sat Sep  2 13:39:14 2006
New Revision: 41811

URL: http://svn.digium.com/view/asterisk?rev=41811&view=rev
Log:
Revert silly 'n' handling since it would break stuff

Modified:
    team/markster/usersconf/pbx/pbx_config.c

Modified: team/markster/usersconf/pbx/pbx_config.c
URL: http://svn.digium.com/view/asterisk/team/markster/usersconf/pbx/pbx_config.c?rev=41811&r1=41810&r2=41811&view=diff
==============================================================================
--- team/markster/usersconf/pbx/pbx_config.c (original)
+++ team/markster/usersconf/pbx/pbx_config.c Sat Sep  2 13:39:14 2006
@@ -1343,7 +1343,6 @@
 	char *end;
 	char *label;
 	char realvalue[256];
-	char lastexten[AST_MAX_EXTENSION] = "";
 	int lastpri = -2;
 	struct ast_context *con;
 	struct ast_variable *v;
@@ -1371,7 +1370,6 @@
 		pbx_builtin_setvar_helper(NULL, v->name, realvalue);
 	}
 	for (cxt = NULL; (cxt = ast_category_browse(cfg, cxt)); ) {
-		lastexten[0] = '\0';
 		/* All categories but "general" or "globals" are considered contexts */
 		if (!strcasecmp(cxt, "general") || !strcasecmp(cxt, "globals"))
 			continue;
@@ -1412,11 +1410,6 @@
 					plus = strchr(pri, '+');
 					if (plus)
 						*plus++ = '\0';
-					if (strcmp(lastexten, realext)) {
-						/* Reset last priority */
-						lastpri = 0;
-						ast_copy_string(lastexten, realext, sizeof(lastexten));
-					}
 					if (!strcmp(pri,"hint"))
 						ipri=PRIORITY_HINT;
 					else if (!strcmp(pri, "next") || !strcmp(pri, "n")) {