[asterisk-commits] tilghman: trunk r83774 - in /trunk: ./ main/app.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Sep 25 09:18:09 2007
New Revision: 83774

URL: http://svn.digium.com/view/asterisk?view=rev&rev=83774
Log:
Merged revisions 83773 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r83773 | tilghman | 2007-09-25 09:13:25 -0500 (Tue, 25 Sep 2007) | 2 lines

jmls pointed out that unsetting the group and setting the group to the blank string aren't quite the same.

........

Modified:
    trunk/   (props changed)
    trunk/main/app.c

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

Modified: trunk/main/app.c
URL: http://svn.digium.com/view/asterisk/trunk/main/app.c?view=diff&rev=83774&r1=83773&r2=83774
==============================================================================
--- trunk/main/app.c (original)
+++ trunk/main/app.c Tue Sep 25 09:18:09 2007
@@ -876,7 +876,9 @@
 	}
 	AST_RWLIST_TRAVERSE_SAFE_END
 
-	if ((gi = calloc(1, len))) {
+	if (ast_strlen_zero(group)) {
+		/* Enable unsetting the group */
+	} else if ((gi = calloc(1, len))) {
 		gi->chan = chan;
 		gi->group = (char *) gi + sizeof(*gi);
 		strcpy(gi->group, group);