diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-01 23:41:16 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-01 23:41:16 +0000 |
| commit | 01b53f1cd1b3e9617ca5c7386f3a2ace8f923e3e (patch) | |
| tree | 71487e5fa82bf035b3453f886c3a80d8a81ee2b4 /channels/chan_phone.c | |
| parent | f24bbeafbb2a2b01f09e018339b875e650870392 (diff) | |
Merged revisions 160170-160172 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r160170 | seanbright | 2008-12-01 18:08:24 -0500 (Mon, 01 Dec 2008) | 1 line
Pay attention to the return value of system(), even if we basically ignore it.
................
r160171 | seanbright | 2008-12-01 18:18:48 -0500 (Mon, 01 Dec 2008) | 1 line
Silence a build warning. (chan_phone.c:810: warning: value computed is not used)
................
r160172 | seanbright | 2008-12-01 18:37:49 -0500 (Mon, 01 Dec 2008) | 10 lines
Merged revisions 159976 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r159976 | mvanbaak | 2008-12-01 11:08:36 -0500 (Mon, 01 Dec 2008) | 3 lines
Get rid of the useless format string and argument in the Bogus/ manager channelname.
Noted by kpfleming and name Bogus/manager suggested by eliel
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@160173 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_phone.c')
| -rw-r--r-- | channels/chan_phone.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_phone.c b/channels/chan_phone.c index 48b26c160..782218b1d 100644 --- a/channels/chan_phone.c +++ b/channels/chan_phone.c @@ -807,7 +807,7 @@ 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) { - memset(tmpbuf + 4, 0, sizeof(tmpbuf) - 4); + (void) memset(tmpbuf + 4, 0, sizeof(tmpbuf) - 4); memcpy(tmpbuf, frame->data, 4); expected = 24; res = phone_write_buf(p, tmpbuf, expected, maxfr, 0); |