aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortzafrir <tzafrir@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-13 21:48:02 +0000
committertzafrir <tzafrir@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-13 21:48:02 +0000
commit7858313d1072451c56169008fd7d7c1da984b958 (patch)
tree7c6b7108da79d09ed4cb75a44d04d3bfc3cc0c89
parentd376e7947ca1d5f43cd78ac358f65f72fea2fac1 (diff)
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 git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@218218 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_phone.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index 6089fae28..1fcf36636 100644
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -807,7 +807,6 @@ static int phone_write(struct ast_channel *ast, struct ast_frame *frame)
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);