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.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83774 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/app.c b/main/app.c
index 50a407adad3f4265da4f4aa4f14cd36cb36b88ef..cee7553fb4c3c39c3bb6bcb395005ac4fe64d0d9 100644 (file)
--- a/main/app.c
+++ b/main/app.c
@@ -876,7 +876,9 @@ int ast_app_group_set_channel(struct ast_channel *chan, const char *data)
        }
        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);