diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-01-31 18:14:05 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-01-31 18:14:05 +0000 |
| commit | b7ecff2e4bbb299bf2f678be49bc52c3820c2562 (patch) | |
| tree | 9aa0c4060ef625657163a1c824e39b4e0f8b5373 | |
| parent | 9b7b62e627a772ea4ab2891363924efe980f44fc (diff) | |
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
| -rw-r--r-- | main/channel.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/main/channel.c b/main/channel.c index dee6fe321..30df1432c 100644 --- a/main/channel.c +++ b/main/channel.c @@ -3012,7 +3012,8 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay, int cdr_answer) */ do { 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); unsigned int done = 0; struct timeval start; @@ -3043,11 +3044,11 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay, int cdr_answer) break; } - if ((new = ast_frisolate(cur)) != cur) { + if ((new_frame = ast_frisolate(cur)) != 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 * 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; } - switch (new->frametype) { + switch (new_frame->frametype) { /* all of these frametypes qualify as 'media' */ case AST_FRAME_VOICE: case AST_FRAME_VIDEO: |