diff options
author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-22 21:17:29 +0000 |
---|---|---|
committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-22 21:17:29 +0000 |
commit | 32e8acd7cfed3e30d7e655ede7b2114e6b2db035 (patch) | |
tree | 3224868456b5100d5d275aa21c72a92227d9bb1e | |
parent | ad7c308be300ee7fa074ec016c800d3bb407f50c (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@190059 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | funcs/func_groupcount.c | 6 | ||||
-rw-r--r-- | include/asterisk/channel.h | 2 | ||||
-rw-r--r-- | main/app.c | 18 | ||||
-rw-r--r-- | main/cli.c | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/funcs/func_groupcount.c b/funcs/func_groupcount.c index f0d7df1b5..47fb9eabf 100644 --- a/funcs/func_groupcount.c +++ b/funcs/func_groupcount.c @@ -45,7 +45,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))) @@ -115,7 +115,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)) @@ -171,7 +171,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 95e5d69e7..e20cae96d 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -1711,7 +1711,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 56ddff438..ffeb70755 100644 --- a/main/app.c +++ b/main/app.c @@ -903,9 +903,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; } @@ -922,7 +922,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; } @@ -941,7 +941,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++; } @@ -964,7 +964,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(®exbuf, gi->group, 0, NULL, 0) && (ast_strlen_zero(category) || (!ast_strlen_zero(gi->category) && !strcasecmp(gi->category, category)))) count++; } @@ -980,11 +980,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); } } @@ -999,9 +999,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 c3cc54d82..56468148c 100644 --- 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(); |