[svn-commits] mvanbaak: trunk r159898 - in /trunk: ./ main/manager.c

[SVN commits to the Digium repositories]

Author: mvanbaak
Date: Mon Dec  1 08:09:59 2008
New Revision: 159898

URL: http://svn.digium.com/view/asterisk?view=rev&rev=159898
Log:
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:
    trunk/   (props changed)
    trunk/main/manager.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/manager.c
URL: http://svn.digium.com/view/asterisk/trunk/main/manager.c?view=diff&rev=159898&r1=159897&r2=159898
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Mon Dec  1 08:09:59 2008
@@ -1814,7 +1814,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);