kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-07 10:28:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 160170-160172 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@160173 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-12-01 23:41:16 +00:00
parent 2ce0cada61
commit 124fb94de6
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/chan_phone.c
View File

@@ -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. */ we have to pad it to 24 bytes still. */
if (frame->datalen == 4) { if (frame->datalen == 4) {
if (p->silencesupression) { if (p->silencesupression) {
memset(tmpbuf + 4, 0, sizeof(tmpbuf) - 4); (void) memset(tmpbuf + 4, 0, sizeof(tmpbuf) - 4);
memcpy(tmpbuf, frame->data, 4); memcpy(tmpbuf, frame->data, 4);
expected = 24; expected = 24;
res = phone_write_buf(p, tmpbuf, expected, maxfr, 0); res = phone_write_buf(p, tmpbuf, expected, maxfr, 0);

2
main/manager.c
View File

@@ -1729,7 +1729,7 @@ static int action_getvar(struct mansession *s, const struct message *m)
if (varname[strlen(varname) - 1] == ')') { if (varname[strlen(varname) - 1] == ')') {
if (!c) { if (!c) {
c = ast_channel_alloc(0, 0, "", "", "", "", "", 0, "Bogus/%p", SENTINEL); c = ast_channel_alloc(0, 0, "", "", "", "", "", 0, "Bogus/manager");
if (c) { if (c) {
ast_func_read(c, (char *) varname, workspace, sizeof(workspace)); ast_func_read(c, (char *) varname, workspace, sizeof(workspace));
ast_channel_free(c); ast_channel_free(c);

4
utils/smsq.c
View File

@@ -400,7 +400,9 @@ static void rxqcheck (char *dir, char *queue, char *process)
setenv ("ud16", temp, 1); setenv ("ud16", temp, 1);
} }
/* run the command */ /* run the command */
system (process); if (system (process) == -1) {
fprintf(stderr, "Failed to fork process '%s'\n", process);
}
} }
closedir (d); closedir (d);
} }