kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 19:28:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove extra defines of AST_PBX_MAX_STACK.

Browse Source 
* 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
This commit is contained in:
Corey Farrell
2014-02-22 02:31:04 +00:00
parent 73709e22ef
commit e468e73b9e
4 changed files with 2 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/conf2ael.c
View File

@@ -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;

37
utils/extconf.c
View File

@@ -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);
}