From 941940654108b894a87c7b77ec70c998280cb140 Mon Sep 17 00:00:00 2001 From: Automerge Script Date: Tue, 10 Jul 2007 15:28:47 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@74312 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- app.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app.c b/app.c index 33b318dd2c..9d1849c776 100644 --- a/app.c +++ b/app.c @@ -1084,7 +1084,7 @@ int ast_app_group_get_count(char *group, char *category) AST_LIST_LOCK(&groups); AST_LIST_TRAVERSE(&groups, gi, list) { - if (!strcasecmp(gi->group, group) && (ast_strlen_zero(category) || !strcasecmp(gi->category, category))) + if (!strcasecmp(gi->group, group) && (ast_strlen_zero(category) || (!ast_strlen_zero(gi->category) && !strcasecmp(gi->category, category)))) count++; } AST_LIST_UNLOCK(&groups); @@ -1107,7 +1107,7 @@ int ast_app_group_match_get_count(char *groupmatch, char *category) AST_LIST_LOCK(&groups); AST_LIST_TRAVERSE(&groups, gi, list) { - if (!regexec(®exbuf, gi->group, 0, NULL, 0) && (ast_strlen_zero(category) || !strcasecmp(gi->category, category))) + if (!regexec(®exbuf, gi->group, 0, NULL, 0) && (ast_strlen_zero(category) || (!ast_strlen_zero(gi->category) && !strcasecmp(gi->category, category)))) count++; } AST_LIST_UNLOCK(&groups); -- 2.47.2