[svn-commits] tilghman: trunk r298479 - in /trunk: ./ funcs/func_dialgroup.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Dec 16 02:56:59 2010
New Revision: 298479

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=298479
Log:
Merged revisions 298478 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r298478 | tilghman | 2010-12-16 02:56:13 -0600 (Thu, 16 Dec 2010) | 15 lines
  
  Merged revisions 298477 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r298477 | tilghman | 2010-12-16 02:54:23 -0600 (Thu, 16 Dec 2010) | 8 lines
    
    Eliminate duplicates from container.
    
    (closes issue #18091)
     Reported by: bunny
     Patches: 
           20101006__issue18091.diff.txt uploaded by tilghman (license 14)
     Tested by: bunny
  ........
................

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

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-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=298479&r1=298478&r2=298479
==============================================================================
--- trunk/funcs/func_dialgroup.c (original)
+++ trunk/funcs/func_dialgroup.c Thu Dec 16 02:56:59 2010
@@ -236,6 +236,11 @@
 
 	if (strcasecmp(args.op, "add") == 0) {
 		for (j = 0; j < inter.argc; j++) {
+			/* Eliminate duplicates */
+			if ((entry = ao2_find(grhead->entries, inter.faces[j], 0))) {
+				ao2_ref(entry, -1);
+				continue;
+			}
 			if ((entry = ao2_alloc(sizeof(*entry), NULL))) {
 				ast_copy_string(entry->name, inter.faces[j], sizeof(entry->name));
 				ao2_link(grhead->entries, entry);