kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-19 16:20:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

misc fixups

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@25925 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-05-09 08:16:07 +00:00
parent fdc225920f
commit 052191ec65
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pbx.c
View File

@@ -2995,7 +2995,7 @@ static void print_ext(struct ast_exten *e, char * buf, int buflen)
} }
/* XXX not verified */ /* XXX not verified */
static int show_dialplan_helper(int fd, const char *context, const char *exten, struct dialplan_counters *dpc, struct ast_include *rinclude, int includecount, char *includes[]) static int show_dialplan_helper(int fd, const char *context, const char *exten, struct dialplan_counters *dpc, struct ast_include *rinclude, int includecount, const char *includes[])
{ {
struct ast_context *c = NULL; struct ast_context *c = NULL;
int res = 0, old_total_exten = dpc->total_exten; int res = 0, old_total_exten = dpc->total_exten;
@@ -3097,7 +3097,7 @@ static int show_dialplan_helper(int fd, const char *context, const char *exten,
} }
} }
if (!dupe) { if (!dupe) {
includes[includecount] = (char *)ast_get_include_name(i); includes[includecount] = ast_get_include_name(i);
show_dialplan_helper(fd, ast_get_include_name(i), exten, dpc, i, includecount + 1, includes); show_dialplan_helper(fd, ast_get_include_name(i), exten, dpc, i, includecount + 1, includes);
} else { } else {
ast_log(LOG_WARNING, "Avoiding circular include of %s within %s\n", ast_get_include_name(i), context); ast_log(LOG_WARNING, "Avoiding circular include of %s within %s\n", ast_get_include_name(i), context);
@@ -3149,7 +3149,7 @@ static int handle_show_dialplan(int fd, int argc, char *argv[])
/* Variables used for different counters */ /* Variables used for different counters */
struct dialplan_counters counters; struct dialplan_counters counters;
char *incstack[AST_PBX_MAX_STACK]; const char *incstack[AST_PBX_MAX_STACK];
memset(&counters, 0, sizeof(counters)); memset(&counters, 0, sizeof(counters));
if (argc != 2 && argc != 3) if (argc != 2 && argc != 3)
@@ -5038,8 +5038,8 @@ static int pbx_builtin_waitexten(struct ast_channel *chan, void *data)
ast_moh_start(chan, opts[0]); ast_moh_start(chan, opts[0]);
/* Wait for "n" seconds */ /* Wait for "n" seconds */
if (args.timeout && atof((char *)args.timeout)) if (args.timeout && atof(args.timeout))
ms = atof((char *)args.timeout) * 1000; ms = atof(args.timeout) * 1000;
else if (chan->pbx) else if (chan->pbx)
ms = chan->pbx->rtimeout * 1000; ms = chan->pbx->rtimeout * 1000;
else else
@@ -5089,7 +5089,7 @@ static int pbx_builtin_background(struct ast_channel *chan, void *data)
AST_STANDARD_APP_ARGS(args, parse); AST_STANDARD_APP_ARGS(args, parse);
if (!args.lang) if (!args.lang)
args.lang = (char *) chan->language; args.lang = (char *)chan->language; /* XXX this is const */
if (!args.context) if (!args.context)
args.context = chan->context; args.context = chan->context;