[asterisk-commits] qwell: trunk r69260 - in /trunk: ./ funcs/func_groupcount.c

[asterisk-commits at lists.digium.com]

Author: qwell
Date: Thu Jun 14 10:25:32 2007
New Revision: 69260

URL: http://svn.digium.com/view/asterisk?view=rev&rev=69260
Log:
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.

........

................

Modified:
    trunk/   (props changed)
    trunk/funcs/func_groupcount.c

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

Modified: trunk/funcs/func_groupcount.c
URL: http://svn.digium.com/view/asterisk/trunk/funcs/func_groupcount.c?view=diff&rev=69260&r1=69259&r2=69260
==============================================================================
--- trunk/funcs/func_groupcount.c (original)
+++ trunk/funcs/func_groupcount.c Thu Jun 14 10:25:32 2007
@@ -48,7 +48,7 @@
 
 	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 @@
 	
 	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 @@
 
 	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();