mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 03:20:57 +00:00
Merged revisions 316265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r316265 | russell | 2011-05-03 14:55:49 -0500 (Tue, 03 May 2011) | 5 lines Fix a bunch of compiler warnings generated by gcc 4.6.0. Most of these are -Wunused-but-set-variable, but there were a few others mixed in here, as well. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316293 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -101,7 +101,6 @@ static int originate_exec(struct ast_channel *chan, const char *data)
|
||||
char *parse;
|
||||
char *chantech, *chandata;
|
||||
int res = -1;
|
||||
int outgoing_res = 0;
|
||||
int outgoing_status = 0;
|
||||
static const unsigned int timeout = 30;
|
||||
static const char default_exten[] = "s";
|
||||
@@ -154,14 +153,14 @@ static int originate_exec(struct ast_channel *chan, const char *data)
|
||||
ast_debug(1, "Originating call to '%s/%s' and connecting them to extension %s,%s,%d\n",
|
||||
chantech, chandata, args.arg1, exten, priority);
|
||||
|
||||
outgoing_res = ast_pbx_outgoing_exten(chantech, cap_slin, chandata,
|
||||
ast_pbx_outgoing_exten(chantech, cap_slin, chandata,
|
||||
timeout * 1000, args.arg1, exten, priority, &outgoing_status, 0, NULL,
|
||||
NULL, NULL, NULL, NULL);
|
||||
} else if (!strcasecmp(args.type, "app")) {
|
||||
ast_debug(1, "Originating call to '%s/%s' and connecting them to %s(%s)\n",
|
||||
chantech, chandata, args.arg1, S_OR(args.arg2, ""));
|
||||
|
||||
outgoing_res = ast_pbx_outgoing_app(chantech, cap_slin, chandata,
|
||||
ast_pbx_outgoing_app(chantech, cap_slin, chandata,
|
||||
timeout * 1000, args.arg1, args.arg2, &outgoing_status, 0, NULL,
|
||||
NULL, NULL, NULL, NULL);
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user