[asterisk-commits] rmudgett: trunk r380653 - /trunk/main/channel.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Jan 31 12:14:05 2013
New Revision: 380653

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=380653
Log:
Eliminate a use of a C++ keyword as a variable. new to new_frame

Modified:
    trunk/main/channel.c

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=380653&r1=380652&r2=380653
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Thu Jan 31 12:14:05 2013
@@ -3012,7 +3012,8 @@
 		 */
 		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 @@
 					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 @@
 					continue;
 				}
 
-				switch (new->frametype) {
+				switch (new_frame->frametype) {
 					/* all of these frametypes qualify as 'media' */
 				case AST_FRAME_VOICE:
 				case AST_FRAME_VIDEO: