[svn-commits] russell: branch 1.6.0 r135440 - in /branches/1.6.0: ./ channels/chan_console.c

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Aug  4 10:02:44 2008
New Revision: 135440

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

........
r135439 | russell | 2008-08-04 10:02:12 -0500 (Mon, 04 Aug 2008) | 4 lines

Be explicit that we don't want a result from this callback.  The callback would
never indicate a match, so nothing would have been returned anyway, but it was
still a poor example of proper usage.

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_console.c

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

Modified: branches/1.6.0/channels/chan_console.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_console.c?view=diff&rev=135440&r1=135439&r2=135440
==============================================================================
--- branches/1.6.0/channels/chan_console.c (original)
+++ branches/1.6.0/channels/chan_console.c Mon Aug  4 10:02:44 2008
@@ -1396,7 +1396,7 @@
 		return -1;
 	}
 	
-	ao2_callback(pvts, 0, pvt_mark_destroy_cb, NULL);
+	ao2_callback(pvts, OBJ_NODATA, pvt_mark_destroy_cb, NULL);
 
 	ast_mutex_lock(&globals_lock);
 	for (v = ast_variable_browse(cfg, "general"); v; v = v->next)