From: Corey Farrell <git@cfware.com>
Date: Sat, 22 Feb 2014 02:29:55 +0000 (+0000)
Subject: Remove extra defines of AST_PBX_MAX_STACK.
X-Git-Tag: 12.2.0-rc1~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=695f77ac12e8a2f1a11f7b80be71c0fee006b9f0;p=thirdparty%2Fasterisk.git

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@408787 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/pbx.c b/main/pbx.c
index 611af6153f..ff231d646d 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -1612,10 +1612,6 @@ int pbx_exec(struct ast_channel *c,	/*!< Channel */
 	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;
diff --git a/res/ael/pval.c b/res/ael/pval.c
index 70bd689862..dc05cf7f15 100644
--- a/res/ael/pval.c
+++ b/res/ael/pval.c
@@ -60,7 +60,6 @@ extern struct ast_flags ast_compat;
 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 */
diff --git a/utils/conf2ael.c b/utils/conf2ael.c
index efd9e81731..ef5225352d 100644
--- a/utils/conf2ael.c
+++ b/utils/conf2ael.c
@@ -75,8 +75,6 @@ static int autofallthrough_config = 0;
 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;
diff --git a/utils/extconf.c b/utils/extconf.c
index 981a64e61a..c4b813e3ae 100644
--- a/utils/extconf.c
+++ b/utils/extconf.c
@@ -95,6 +95,7 @@ struct ast_channel
 #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 static_config = 0;
 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 @@ struct ast_app;
 #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);
@@ -4774,22 +4759,6 @@ static struct ast_context *ast_context_find(const char *name)
 	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}
  * return 0 on no-match, 1 on match, 2 on early match.
@@ -6220,9 +6189,7 @@ static void ast_merge_contexts_and_delete(struct ast_context **extcontexts, cons
 	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);
 }