[svn-commits] mvanbaak: branch 1.6.0 r159974 - in /branches/1.6.0: ./ main/manager.c

[SVN commits to the Digium repositories]

Author: mvanbaak
Date: Mon Dec  1 10:04:31 2008
New Revision: 159974

URL: http://svn.digium.com/view/asterisk?view=rev&rev=159974
Log:
Merged revisions 159898 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r159898 | mvanbaak | 2008-12-01 15:09:59 +0100 (Mon, 01 Dec 2008) | 11 lines
  
  Merged revisions 159897 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r159897 | mvanbaak | 2008-12-01 15:05:41 +0100 (Mon, 01 Dec 2008) | 4 lines
    
    make manager compile on OpenBSD.
    The last (10th) argument to ast_channel_alloc here should be a pointer
    and NULL is not really a pointer.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/manager.c

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

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=159974&r1=159973&r2=159974
==============================================================================
--- branches/1.6.0/main/manager.c (original)
+++ branches/1.6.0/main/manager.c Mon Dec  1 10:04:31 2008
@@ -1729,7 +1729,7 @@
 
 	if (varname[strlen(varname) - 1] == ')') {
 		if (!c) {
-			c = ast_channel_alloc(0, 0, "", "", "", "", "", 0, "Bogus/%p", NULL);
+			c = ast_channel_alloc(0, 0, "", "", "", "", "", 0, "Bogus/%p", SENTINEL);
 			if (c) {
 				ast_func_read(c, (char *) varname, workspace, sizeof(workspace));
 				ast_channel_free(c);