sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate a use of a C++ keyword as a variable. new to new_frame 

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@380653 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett 2013-01-31 18:14:05 +00:00
parent 9b7b62e627
commit b7ecff2e4b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/channel.c
View File

@ -3012,7 +3012,8 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay, int cdr_answer)
*/ */
do { do {
AST_LIST_HEAD_NOLOCK(, ast_frame) frames; AST_LIST_HEAD_NOLOCK(, ast_frame) frames;
struct ast_frame *cur, *new; struct ast_frame *cur;
struct ast_frame *new_frame;
int timeout_ms = MAX(delay, 500); int timeout_ms = MAX(delay, 500);
unsigned int done = 0; unsigned int done = 0;
struct timeval start; struct timeval start;
@ -3043,11 +3044,11 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay, int cdr_answer)
break; break;
} }
if ((new = ast_frisolate(cur)) != cur) { if ((new_frame = ast_frisolate(cur)) != cur) {
ast_frfree(cur); ast_frfree(cur);
} }
AST_LIST_INSERT_HEAD(&frames, new, frame_list); AST_LIST_INSERT_HEAD(&frames, new_frame, frame_list);
/* if a specific delay period was requested, continue /* if a specific delay period was requested, continue
* until that delay has passed. don't stop just because * until that delay has passed. don't stop just because
@ -3057,7 +3058,7 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay, int cdr_answer)
continue; continue;
} }
switch (new->frametype) { switch (new_frame->frametype) {
/* all of these frametypes qualify as 'media' */ /* all of these frametypes qualify as 'media' */
case AST_FRAME_VOICE: case AST_FRAME_VOICE:
case AST_FRAME_VIDEO: case AST_FRAME_VIDEO: