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 | |
| 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
| -rw-r--r-- | channels/chan_phone.c | 2 | ||||
| -rw-r--r-- | main/manager.c | 2 | ||||
| -rw-r--r-- | utils/smsq.c | 4 |
3 files changed, 5 insertions, 3 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); diff --git a/main/manager.c b/main/manager.c index 6c28fed9d..bcf222f3a 100644 --- a/main/manager.c +++ b/main/manager.c @@ -1729,7 +1729,7 @@ static int action_getvar(struct mansession *s, const struct message *m) if (varname[strlen(varname) - 1] == ')') { if (!c) { - c = ast_channel_alloc(0, 0, "", "", "", "", "", 0, "Bogus/%p", SENTINEL); + c = ast_channel_alloc(0, 0, "", "", "", "", "", 0, "Bogus/manager"); if (c) { ast_func_read(c, (char *) varname, workspace, sizeof(workspace)); ast_channel_free(c); diff --git a/utils/smsq.c b/utils/smsq.c index af8238c84..a55a71225 100644 --- a/utils/smsq.c +++ b/utils/smsq.c @@ -400,7 +400,9 @@ static void rxqcheck (char *dir, char *queue, char *process) setenv ("ud16", temp, 1); } /* run the command */ - system (process); + if (system (process) == -1) { + fprintf(stderr, "Failed to fork process '%s'\n", process); + } } closedir (d); } |