[svn-commits] seanbright: branch 1.6.0 r160173 - in /branches/1.6.0: ./ channels/ main/ utils/

[SVN commits to the Digium repositories]

Author: seanbright
Date: Mon Dec  1 17:41:16 2008
New Revision: 160173

URL: http://svn.digium.com/view/asterisk?view=rev&rev=160173
Log:
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
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_phone.c
    branches/1.6.0/main/manager.c
    branches/1.6.0/utils/smsq.c

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

Modified: branches/1.6.0/channels/chan_phone.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_phone.c?view=diff&rev=160173&r1=160172&r2=160173
==============================================================================
--- branches/1.6.0/channels/chan_phone.c (original)
+++ branches/1.6.0/channels/chan_phone.c Mon Dec  1 17:41:16 2008
@@ -807,7 +807,7 @@
 		   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);

Modified: branches/1.6.0/main/manager.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/manager.c?view=diff&rev=160173&r1=160172&r2=160173
==============================================================================
--- branches/1.6.0/main/manager.c (original)
+++ branches/1.6.0/main/manager.c Mon Dec  1 17:41:16 2008
@@ -1729,7 +1729,7 @@
 
 	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);

Modified: branches/1.6.0/utils/smsq.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/utils/smsq.c?view=diff&rev=160173&r1=160172&r2=160173
==============================================================================
--- branches/1.6.0/utils/smsq.c (original)
+++ branches/1.6.0/utils/smsq.c Mon Dec  1 17:41:16 2008
@@ -400,7 +400,9 @@
             setenv ("ud16", temp, 1);
          }
          /* run the command */
-         system (process);
+         if (system (process) == -1) {
+            fprintf(stderr, "Failed to fork process '%s'\n", process);
+         }
       }
    closedir (d);
 }