[asterisk-commits] tzafrir: branch 1.6.1 r218218 - in /branches/1.6.1: ./ channels/chan_phone.c

[SVN commits to the Asterisk project]

Author: tzafrir
Date: Sun Sep 13 16:48:02 2009
New Revision: 218218

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=218218
Log:
gcc 4.4: Remove a nop memset size 0 that annoys gcc

This memset doesn't write beyond the end of the buffer.
(tmpbuf has size of 4).

Merged revisions 218184 via svnmerge from 
http://svn.digium.com/svn/asterisk/trunk

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_phone.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_phone.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_phone.c?view=diff&rev=218218&r1=218217&r2=218218
==============================================================================
--- branches/1.6.1/channels/chan_phone.c (original)
+++ branches/1.6.1/channels/chan_phone.c Sun Sep 13 16:48:02 2009
@@ -807,7 +807,6 @@
 		   we have to pad it to 24 bytes still.  */
 		if (frame->datalen == 4) {
 			if (p->silencesupression) {
-				(void) memset(tmpbuf + 4, 0, sizeof(tmpbuf) - 4);
 				memcpy(tmpbuf, frame->data.ptr, 4);
 				expected = 24;
 				res = phone_write_buf(p, tmpbuf, expected, maxfr, 0);