[asterisk-commits] coreyfarrell: branch 12 r408787 - in /branches/12: ./ main/ res/ael/ utils/

[SVN commits to the Asterisk project]

Author: coreyfarrell
Date: Fri Feb 21 20:29:55 2014
New Revision: 408787

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=408787
Log:
Remove extra defines of AST_PBX_MAX_STACK.

* Ensure AST_PBX_MAX_STACK is only defined in extconf.h and pbx.h.
* Fix incorrect function parameters in utils/extconf.c.

(closes issue ASTERISK-23141)
Reported by: Maxim
Review: https://reviewboard.asterisk.org/r/3241/
........

Merged revisions 408785 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 408786 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/main/pbx.c
    branches/12/res/ael/pval.c
    branches/12/utils/conf2ael.c
    branches/12/utils/extconf.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/pbx.c?view=diff&rev=408787&r1=408786&r2=408787
==============================================================================
--- branches/12/main/pbx.c (original)
+++ branches/12/main/pbx.c Fri Feb 21 20:29:55 2014
@@ -1612,10 +1612,6 @@
 	return res;
 }
 
-
-/*! Go no deeper than this through includes (not counting loops) */
-#define AST_PBX_MAX_STACK	128
-
 static struct ast_app *pbx_findapp_nolock(const char *name)
 {
 	struct ast_app *cur;

Modified: branches/12/res/ael/pval.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/res/ael/pval.c?view=diff&rev=408787&r1=408786&r2=408787
==============================================================================
--- branches/12/res/ael/pval.c (original)
+++ branches/12/res/ael/pval.c Fri Feb 21 20:29:55 2014
@@ -60,7 +60,6 @@
 extern int localized_pbx_load_module(void);
 
 static char expr_output[2096];
-#define AST_PBX_MAX_STACK  128
 #define BUF_SIZE 2000
 
 /* these functions are in ../ast_expr2.fl */

Modified: branches/12/utils/conf2ael.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/utils/conf2ael.c?view=diff&rev=408787&r1=408786&r2=408787
==============================================================================
--- branches/12/utils/conf2ael.c (original)
+++ branches/12/utils/conf2ael.c Fri Feb 21 20:29:55 2014
@@ -75,8 +75,6 @@
 static int clearglobalvars_config = 0;
 char ast_config_AST_SYSTEM_NAME[20] = ""; */
 
-/*! Go no deeper than this through includes (not counting loops) */
-#define AST_PBX_MAX_STACK	128
 /* static AST_RWLIST_HEAD_STATIC(acf_root, ast_custom_function); */
 //extern char ast_config_AST_CONFIG_DIR[PATH_MAX];
 int option_debug = 0;

Modified: branches/12/utils/extconf.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/utils/extconf.c?view=diff&rev=408787&r1=408786&r2=408787
==============================================================================
--- branches/12/utils/extconf.c (original)
+++ branches/12/utils/extconf.c Fri Feb 21 20:29:55 2014
@@ -95,6 +95,7 @@
 #include "asterisk/inline_api.h"
 #include "asterisk/endian.h"
 #include "asterisk/ast_expr.h"
+#include "asterisk/extconf.h"
 
 /* logger.h */
 
@@ -2692,8 +2693,6 @@
 static int write_protect_config = 1;
 static int autofallthrough_config = 0;
 static int clearglobalvars_config = 0;
-/*! Go no deeper than this through includes (not counting loops) */
-#define AST_PBX_MAX_STACK	128
 static void pbx_substitute_variables_helper(struct ast_channel *c,const char *cp1,char *cp2,int count);
 
 
@@ -4234,20 +4233,6 @@
 #else
 #define EXT_DATA_SIZE 8192
 #endif
-/*!
- * When looking up extensions, we can have different requests
- * identified by the 'action' argument, as follows.
- * Note that the coding is such that the low 4 bits are the
- * third argument to extension_match_core.
- */
-enum ext_match_t {
-	E_MATCHMORE = 	0x00,	/* extension can match but only with more 'digits' */
-	E_CANMATCH =	0x01,	/* extension can match with or without more 'digits' */
-	E_MATCH =	0x02,	/* extension is an exact match */
-	E_MATCH_MASK =	0x03,	/* mask for the argument to extension_match_core() */
-	E_SPAWN =	0x12,	/* want to spawn an extension. Requires exact match */
-	E_FINDLABEL =	0x22	/* returns the priority for a given label. Requires exact match */
-};
 
 #ifdef NOT_ANYMORE
 static AST_RWLIST_HEAD_STATIC(switches, ast_switch);
@@ -4773,22 +4758,6 @@
 	}
 	return tmp;
 }
-
-/* request and result for pbx_find_extension */
-struct pbx_find_info {
-#if 0
-	const char *context;
-	const char *exten;
-	int priority;
-#endif
-
-	char *incstack[AST_PBX_MAX_STACK];      /* filled during the search */
-	int stacklen;                   /* modified during the search */
-	int status;                     /* set on return */
-	struct ast_switch *swo;         /* set on return */
-	const char *data;               /* set on return */
-	const char *foundcontext;       /* set on return */
-};
 
 /*
  * Internal function for ast_extension_{match|close}
@@ -6220,9 +6189,7 @@
 	return;
 }
 
-void localized_merge_contexts_and_delete(struct ast_context **extcontexts, const char *registrar);
-
-void localized_merge_contexts_and_delete(struct ast_context **extcontexts, const char *registrar)
+void localized_merge_contexts_and_delete(struct ast_context **extcontexts, void *tab, const char *registrar)
 {
 	ast_merge_contexts_and_delete(extcontexts, registrar);
 }