[asterisk-commits] jpeeler: branch 1.6.1 r190063 - in /branches/1.6.1: ./ funcs/ include/asteris...

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed Apr 22 16:18:11 2009
New Revision: 190063

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=190063
Log:
Merged revisions 190057 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r190057 | jpeeler | 2009-04-22 16:15:55 -0500 (Wed, 22 Apr 2009) | 9 lines
  
  Fix building of chan_h323 with gcc-3.3
  
  There seems to be a bug with old versions of g++ that doesn't allow a structure
  member to use the name list. Rename list member to group_list in ast_group_info
  and change the few places it is used.
  
  (closes issue #14790)
  Reported by: stuarth
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/funcs/func_groupcount.c
    branches/1.6.1/include/asterisk/channel.h
    branches/1.6.1/main/app.c
    branches/1.6.1/main/cli.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/funcs/func_groupcount.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/funcs/func_groupcount.c?view=diff&rev=190063&r1=190062&r2=190063
==============================================================================
--- branches/1.6.1/funcs/func_groupcount.c (original)
+++ branches/1.6.1/funcs/func_groupcount.c Wed Apr 22 16:18:11 2009
@@ -46,7 +46,7 @@
 		struct ast_group_info *gi = NULL;
 
 		ast_app_group_list_rdlock();
-		for (gi = ast_app_group_list_head(); gi; gi = AST_LIST_NEXT(gi, list)) {
+		for (gi = ast_app_group_list_head(); gi; gi = AST_LIST_NEXT(gi, group_list)) {
 			if (gi->chan != chan)
 				continue;
 			if (ast_strlen_zero(category) || (!ast_strlen_zero(gi->category) && !strcasecmp(gi->category, category)))
@@ -120,7 +120,7 @@
 	
 	ast_app_group_list_rdlock();
 	
-	for (gi = ast_app_group_list_head(); gi; gi = AST_LIST_NEXT(gi, list)) {
+	for (gi = ast_app_group_list_head(); gi; gi = AST_LIST_NEXT(gi, group_list)) {
 		if (gi->chan != chan)
 			continue;
 		if (ast_strlen_zero(data))
@@ -178,7 +178,7 @@
 
 	ast_app_group_list_rdlock();
 
-	for (gi = ast_app_group_list_head(); gi; gi = AST_LIST_NEXT(gi, list)) {
+	for (gi = ast_app_group_list_head(); gi; gi = AST_LIST_NEXT(gi, group_list)) {
 		if (gi->chan != chan)
 			continue;
 		if (!ast_strlen_zero(tmp1)) {

Modified: branches/1.6.1/include/asterisk/channel.h
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/include/asterisk/channel.h?view=diff&rev=190063&r1=190062&r2=190063
==============================================================================
--- branches/1.6.1/include/asterisk/channel.h (original)
+++ branches/1.6.1/include/asterisk/channel.h Wed Apr 22 16:18:11 2009
@@ -1748,7 +1748,7 @@
 	struct ast_channel *chan;
 	char *category;
 	char *group;
-	AST_LIST_ENTRY(ast_group_info) list;
+	AST_LIST_ENTRY(ast_group_info) group_list;
 };
 
 

Modified: branches/1.6.1/main/app.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/app.c?view=diff&rev=190063&r1=190062&r2=190063
==============================================================================
--- branches/1.6.1/main/app.c (original)
+++ branches/1.6.1/main/app.c Wed Apr 22 16:18:11 2009
@@ -948,9 +948,9 @@
 		len += strlen(category) + 1;
 	
 	AST_RWLIST_WRLOCK(&groups);
-	AST_RWLIST_TRAVERSE_SAFE_BEGIN(&groups, gi, list) {
+	AST_RWLIST_TRAVERSE_SAFE_BEGIN(&groups, gi, group_list) {
 		if ((gi->chan == chan) && ((ast_strlen_zero(category) && ast_strlen_zero(gi->category)) || (!ast_strlen_zero(gi->category) && !strcasecmp(gi->category, category)))) {
-			AST_RWLIST_REMOVE_CURRENT(list);
+			AST_RWLIST_REMOVE_CURRENT(group_list);
 			free(gi);
 			break;
 		}
@@ -967,7 +967,7 @@
 			gi->category = (char *) gi + sizeof(*gi) + strlen(group) + 1;
 			strcpy(gi->category, category);
 		}
-		AST_RWLIST_INSERT_TAIL(&groups, gi, list);
+		AST_RWLIST_INSERT_TAIL(&groups, gi, group_list);
 	} else {
 		res = -1;
 	}
@@ -986,7 +986,7 @@
 		return 0;
 	
 	AST_RWLIST_RDLOCK(&groups);
-	AST_RWLIST_TRAVERSE(&groups, gi, list) {
+	AST_RWLIST_TRAVERSE(&groups, gi, group_list) {
 		if (!strcasecmp(gi->group, group) && (ast_strlen_zero(category) || (!ast_strlen_zero(gi->category) && !strcasecmp(gi->category, category))))
 			count++;
 	}
@@ -1009,7 +1009,7 @@
 		return 0;
 
 	AST_RWLIST_RDLOCK(&groups);
-	AST_RWLIST_TRAVERSE(&groups, gi, list) {
+	AST_RWLIST_TRAVERSE(&groups, gi, group_list) {
 		if (!regexec(&regexbuf, gi->group, 0, NULL, 0) && (ast_strlen_zero(category) || (!ast_strlen_zero(gi->category) && !strcasecmp(gi->category, category))))
 			count++;
 	}
@@ -1025,11 +1025,11 @@
 	struct ast_group_info *gi = NULL;
 
 	AST_RWLIST_WRLOCK(&groups);
-	AST_RWLIST_TRAVERSE_SAFE_BEGIN(&groups, gi, list) {
+	AST_RWLIST_TRAVERSE_SAFE_BEGIN(&groups, gi, group_list) {
 		if (gi->chan == old) {
 			gi->chan = new;
 		} else if (gi->chan == new) {
-			AST_RWLIST_REMOVE_CURRENT(list);
+			AST_RWLIST_REMOVE_CURRENT(group_list);
 			ast_free(gi);
 		}
 	}
@@ -1044,9 +1044,9 @@
 	struct ast_group_info *gi = NULL;
 	
 	AST_RWLIST_WRLOCK(&groups);
-	AST_RWLIST_TRAVERSE_SAFE_BEGIN(&groups, gi, list) {
+	AST_RWLIST_TRAVERSE_SAFE_BEGIN(&groups, gi, group_list) {
 		if (gi->chan == chan) {
-			AST_RWLIST_REMOVE_CURRENT(list);
+			AST_RWLIST_REMOVE_CURRENT(group_list);
 			ast_free(gi);
 		}
 	}

Modified: branches/1.6.1/main/cli.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/cli.c?view=diff&rev=190063&r1=190062&r2=190063
==============================================================================
--- branches/1.6.1/main/cli.c (original)
+++ branches/1.6.1/main/cli.c Wed Apr 22 16:18:11 2009
@@ -1162,7 +1162,7 @@
 			ast_cli(a->fd, FORMAT_STRING, gi->chan->name, gi->group, (ast_strlen_zero(gi->category) ? "(default)" : gi->category));
 			numchans++;
 		}
-		gi = AST_LIST_NEXT(gi, list);
+		gi = AST_LIST_NEXT(gi, group_list);
 	}
 	
 	ast_app_group_list_unlock();