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
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@190063 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/funcs/func_groupcount.c b/funcs/func_groupcount.c
index b70a42e94ae13a5f9e2ccf835915ee23cca5ecfa..405e0db32bfa20c833ad14c32940ef3885db3c82 100644 (file)
--- a/funcs/func_groupcount.c
+++ b/funcs/func_groupcount.c
@@ -46,7 +46,7 @@ static int group_count_function_read(struct ast_channel *chan, const char *cmd,
                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 @@ static int group_function_read(struct ast_channel *chan, const char *cmd,
        
        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 @@ static int group_list_function_read(struct ast_channel *chan, const char *cmd,
 
        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)) {

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index e4e8bfea74a9146a9245f5f78ec5e634851e96a4..8488380db88136ec3d8e9c21ca410f93a0d67af9 100644 (file)
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -1748,7 +1748,7 @@ struct ast_group_info {
        struct ast_channel *chan;
        char *category;
        char *group;
-       AST_LIST_ENTRY(ast_group_info) list;
+       AST_LIST_ENTRY(ast_group_info) group_list;
 };
 
 

diff --git a/main/app.c b/main/app.c
index 7e65d9568812ca5f7d6afdf9ad096fc780ff8ca4..5c0449a3d380ff5dd84e33dff4294b050b57b935 100644 (file)
--- a/main/app.c
+++ b/main/app.c
@@ -948,9 +948,9 @@ int ast_app_group_set_channel(struct ast_channel *chan, const char *data)
                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 @@ int ast_app_group_set_channel(struct ast_channel *chan, const char *data)
                        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 @@ int ast_app_group_get_count(const char *group, const char *category)
                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 @@ int ast_app_group_match_get_count(const char *groupmatch, const char *category)
                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 @@ int ast_app_group_update(struct ast_channel *old, struct ast_channel *new)
        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 @@ int ast_app_group_discard(struct ast_channel *chan)
        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);
                }
        }

diff --git a/main/cli.c b/main/cli.c
index f6982ad681ac5f360f75f1df99f7e936abec0091..2e26f96bb4484f6584ffe6d5a2619a500c49eae9 100644 (file)
--- a/main/cli.c
+++ b/main/cli.c
@@ -1162,7 +1162,7 @@ static char *group_show_channels(struct ast_cli_entry *e, int cmd, struct ast_cl
                        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();