[svn-commits] rmudgett: branch group/issue8824 r164412 - /team/group/issue8824/main/channel.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Mon Dec 15 13:01:33 2008
New Revision: 164412

URL: http://svn.digium.com/view/asterisk?view=rev&rev=164412
Log:
*  Fixed compiler warnings from -r164267 as a result of
trunk -r164203 merge conflicts.
*  Merged from https://origsvn.digium.com/svn/asterisk/be/branches/C.2...
..........
r164398 | rmudgett | 2008-12-15 12:44:11 -0600 (Mon, 15 Dec 2008) | 1 line

Make sure res is set correctly in ast_indicate_data() for the following test

Modified:
    team/group/issue8824/main/channel.c

Modified: team/group/issue8824/main/channel.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/main/channel.c?view=diff&rev=164412&r1=164411&r2=164412
==============================================================================
--- team/group/issue8824/main/channel.c (original)
+++ team/group/issue8824/main/channel.c Mon Dec 15 13:01:33 2008
@@ -3309,7 +3309,9 @@
 	case AST_CONTROL_ANSWER:
 	case AST_CONTROL_HANGUP:
 	case AST_CONTROL_T38:
-		return 0;
+	case AST_CONTROL_CONNECTED_LINE:
+	case AST_CONTROL_REDIRECTING:
+		break;
 
 	case AST_CONTROL_CONGESTION:
 	case AST_CONTROL_BUSY:
@@ -3330,7 +3332,7 @@
 	 * in switch statements. */
 	enum ast_control_frame_type condition = _condition;
 	const struct ind_tone_zone_sound *ts = NULL;
-	int res = -1;
+	int res;
 
 	ast_channel_lock(chan);
 
@@ -3369,10 +3371,11 @@
 	default:
 		break;
 	}	/* end switch */
-
 	if (chan->tech->indicate) {
 		/* See if the channel driver can handle this condition. */
 		res = chan->tech->indicate(chan, condition, data, datalen);
+	} else {
+		res = -1;
 	}
 
 	ast_channel_unlock(chan);
@@ -3388,7 +3391,7 @@
 	/* The channel driver does not support this indication, let's fake
 	 * it by doing our own tone generation if applicable. */
 
-	if (condition < 0) {
+	if (_condition < 0) {
 		/* Stop any tones that are playing */
 		ast_playtones_stop(chan);
 		return 0;
@@ -3422,6 +3425,8 @@
 	case AST_CONTROL_HOLD:
 	case AST_CONTROL_UNHOLD:
 	case AST_CONTROL_T38:
+	case AST_CONTROL_CONNECTED_LINE:
+	case AST_CONTROL_REDIRECTING:
 		/* Nothing left to do for these. */
 		res = 0;
 		break;