From f593698f79eec73633418c148d51e8df395ed8d1 Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Thu, 14 Jun 2007 15:25:32 +0000
Subject: [PATCH] Merged revisions 69259 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r69259 | qwell | 2007-06-14 10:21:29 -0500 (Thu, 14 Jun 2007) | 12 lines
Merged revisions 69258 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r69258 | qwell | 2007-06-14 10:15:53 -0500 (Thu, 14 Jun 2007) | 4 lines
Change a quite broken while loop to a for loop, so "continue;" works as expected instead of eating 99% CPU...
Issue 9966, patch by me.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@69260 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
funcs/func_groupcount.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/funcs/func_groupcount.c b/funcs/func_groupcount.c
index a72277a367..883920112b 100644
--- a/funcs/func_groupcount.c
+++ b/funcs/func_groupcount.c
@@ -48,7 +48,7 @@ static int group_count_function_read(struct ast_channel *chan, const char *cmd,
if ((count = ast_app_group_get_count(group, category)) == -1)
ast_log(LOG_NOTICE, "No group could be found for channel '%s'\n", chan->name);
- else
+ else
snprintf(buf, len, "%d", count);
return 0;
@@ -102,15 +102,13 @@ static int group_function_read(struct ast_channel *chan, const char *cmd,
ast_app_group_list_rdlock();
- 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)
@@ -160,23 +158,21 @@ static int group_list_function_read(struct ast_channel *chan, const char *cmd,
ast_app_group_list_rdlock();
- 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)) {
ast_copy_string(tmp2, tmp1, sizeof(tmp2));
if (!ast_strlen_zero(gi->category))
snprintf(tmp1, sizeof(tmp1), "%s %s@%s", tmp2, gi->group, gi->category);
- else
+ else
snprintf(tmp1, sizeof(tmp1), "%s %s", tmp2, gi->group);
} else {
if (!ast_strlen_zero(gi->category))
snprintf(tmp1, sizeof(tmp1), "%s@%s", gi->group, gi->category);
- else
+ else
snprintf(tmp1, sizeof(tmp1), "%s", gi->group);
}
- gi = AST_LIST_NEXT(gi, list);
}
ast_app_group_list_unlock();
--
GitLab