[asterisk-commits] rmudgett: trunk r343338 - in /trunk: ./ funcs/func_dialgroup.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Nov  3 14:57:49 2011
New Revision: 343338

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=343338
Log:
Remove invalid flag given to iterator in func_dialgroup.c
........

Merged revisions 343336 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 343337 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/funcs/func_dialgroup.c

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

Modified: trunk/funcs/func_dialgroup.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_dialgroup.c?view=diff&rev=343338&r1=343337&r2=343338
==============================================================================
--- trunk/funcs/func_dialgroup.c (original)
+++ trunk/funcs/func_dialgroup.c Thu Nov  3 14:57:49 2011
@@ -144,7 +144,7 @@
 
 	buf[0] = '\0';
 
-	i = ao2_iterator_init(grhead->entries, OBJ_POINTER);
+	i = ao2_iterator_init(grhead->entries, 0);
 	while ((entry = ao2_iterator_next(&i))) {
 		int tmp = strlen(entry->name);
 		/* Ensure that we copy only complete names, not partials */