More RSW merges. Everything from apps/ except for the big offenders

app_voicemail and app_queue.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-08-10 14:45:25 +00:00
parent 357bf3e90b
commit 3ffb39833b
18 changed files with 211 additions and 213 deletions

View File

@@ -318,7 +318,7 @@ static int disa_exec(struct ast_channel *chan, void *data)
if (k == 3) {
int recheck = 0;
struct ast_flags flags = { AST_CDR_FLAG_POSTED };
struct ast_flags cdr_flags = { AST_CDR_FLAG_POSTED };
if (!ast_exists_extension(chan, args.context, exten, 1, chan->cid.cid_num)) {
pbx_builtin_setvar_helper(chan, "INVALID_EXTEN", exten);
@@ -337,8 +337,8 @@ static int disa_exec(struct ast_channel *chan, void *data)
if (!ast_strlen_zero(acctcode))
ast_string_field_set(chan, accountcode, acctcode);
if (special_noanswer) flags.flags = 0;
ast_cdr_reset(chan->cdr, &flags);
if (special_noanswer) cdr_flags.flags = 0;
ast_cdr_reset(chan->cdr, &cdr_flags);
ast_explicit_goto(chan, args.context, exten, 1);
return 0;
}