[asterisk-commits] jpeeler: branch 1.4 r243258 - /branches/1.4/main/channel.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Jan 26 12:19:10 2010
New Revision: 243258

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=243258
Log:
Remove unnecessary code in ast_read as issue 16058 has been fully solved now.

Modified:
    branches/1.4/main/channel.c

Modified: branches/1.4/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/channel.c?view=diff&rev=243258&r1=243257&r2=243258
==============================================================================
--- branches/1.4/main/channel.c (original)
+++ branches/1.4/main/channel.c Tue Jan 26 12:19:10 2010
@@ -2531,19 +2531,6 @@
 		ast_frame_dump(chan->name, f, "<<");
 	chan->fin = FRAMECOUNT_INC(chan->fin);
 
-	if (f && f->frametype == AST_FRAME_CONTROL && f->subclass == AST_CONTROL_HOLD && f->datalen == 0 && f->data) {
-		/* fix invalid pointer */
-		f->data = NULL;
-#ifdef AST_DEVMODE
-		ast_log(LOG_ERROR, "Found HOLD frame with src '%s' on channel '%s' with datalen zero, but non-null data pointer!\n", f->src, chan->name);
-		ast_frame_dump(chan->name, f, "<<");
-#else
-		if (option_debug > 2) {
-			ast_log(LOG_DEBUG, "Found HOLD frame with src '%s' on channel '%s' with datalen zero, but non-null data pointer!\n", f->src, chan->name);
-		}
-#endif
-	}
-
 done:
 	ast_channel_unlock(chan);
 	return f;