kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-19 03:07:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@69307 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge Script
2007-06-14 16:34:48 +00:00
parent 42e9e81c21
commit db56721c38
1 changed files with 41 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
funcs/func_groupcount.c
View File

@@ -97,15 +97,13 @@ static char *group_function_read(struct ast_channel *chan, char *cmd, char *data
ast_app_group_list_lock();
gi = ast_app_group_list_head();
while (gi) {
for (gi = ast_app_group_list_head(); gi; gi = AST_LIST_NEXT(gi, list)) {
if (gi->chan != chan)
continue;
if (ast_strlen_zero(data))
break;
if (!ast_strlen_zero(gi->category) && !strcasecmp(gi->category, data))
break;
gi = AST_LIST_NEXT(gi, list);
}
if (gi)
@@ -150,8 +148,7 @@ static char *group_list_function_read(struct ast_channel *chan, char *cmd, char
ast_app_group_list_lock();
gi = ast_app_group_list_head();
while (gi) {
for (gi = ast_app_group_list_head(); gi; gi = AST_LIST_NEXT(gi, list)) {
if (gi->chan != chan)
continue;
if (!ast_strlen_zero(tmp1)) {
@@ -166,7 +163,6 @@ static char *group_list_function_read(struct ast_channel *chan, char *cmd, char
else
snprintf(tmp1, sizeof(tmp1), "%s", gi->group);
}
gi = AST_LIST_NEXT(gi, list);
}
ast_app_group_list_unlock();