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

more simplifications

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21479 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-04-19 14:14:40 +00:00
parent 3aaaa41609
commit acf0f038dc
1 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/app_dial.c
View File

@@ -334,24 +334,12 @@ static int onedigit_goto(struct ast_channel *chan, const char *context, char ext
} }
static char *get_cid_name(char *name, int namelen, struct ast_channel *chan) static const char *get_cid_name(char *name, int namelen, struct ast_channel *chan)
{ {
char *context; const char *context = S_OR(chan->macrocontext, chan->context);
char *exten; const char *exten = S_OR(chan->macroexten, chan->exten);
if (!ast_strlen_zero(chan->macrocontext))
context = chan->macrocontext;
else
context = chan->context;
if (!ast_strlen_zero(chan->macroexten)) return ast_get_hint(NULL, 0, name, namelen, chan, context, exten) ? name : "";
exten = chan->macroexten;
else
exten = chan->exten;
if (ast_get_hint(NULL, 0, name, namelen, chan, context, exten))
return name;
else
return "";
} }
static void senddialevent(struct ast_channel *src, struct ast_channel *dst) static void senddialevent(struct ast_channel *src, struct ast_channel *dst)
@@ -424,7 +412,6 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct dial_l
return NULL; return NULL;
} }
winner = ast_waitfor_n(watchers, pos, to); winner = ast_waitfor_n(watchers, pos, to);
o = outgoing;
for (o = outgoing; o; o = o->next) { for (o = outgoing; o; o = o->next) {
struct ast_frame *f; struct ast_frame *f;
struct ast_channel *c = o->chan; struct ast_channel *c = o->chan;