diff options
author | Corey Farrell <git@cfware.com> | 2014-02-22 02:31:04 +0000 |
---|---|---|
committer | Corey Farrell <git@cfware.com> | 2014-02-22 02:31:04 +0000 |
commit | e468e73b9e5c60f2cd1f46efae104a9d891ed47b (patch) | |
tree | 7ad312e5247ddf914612e53d2a7a4a798d71fb15 /utils | |
parent | 73709e22ef96dd97231497610c1c636c7e3663c4 (diff) |
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
........
Merged revisions 408787 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@408788 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'utils')
-rw-r--r-- | utils/conf2ael.c | 2 | ||||
-rw-r--r-- | utils/extconf.c | 37 |
2 files changed, 2 insertions, 37 deletions
diff --git a/utils/conf2ael.c b/utils/conf2ael.c index efd9e8173..ef5225352 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 f62553d09..1d9884041 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 */ @@ -2691,8 +2692,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); @@ -4233,20 +4232,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); @@ -4773,22 +4758,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. @@ -6219,9 +6188,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); } |