diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-03-09 00:21:46 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-03-09 00:21:46 +0000 |
| commit | 761465d6425fa0c5ce61095fe45588292ead1b15 (patch) | |
| tree | d2421cbcfc5b3b2dcaaea1d04b4c515ef740c365 /apps/confbridge/conf_config_parser.c | |
| parent | b4a010e958226d21750a5a1797bf50f22898e974 (diff) | |
confbridge: Rename items for clarity and consistency.
struct conference_bridge_user -> struct confbridge_user
struct conference_bridge -> struct confbridge_conference
struct conference_state -> struct confbridge_state
struct conference_bridge_user *conference_bridge_user -> struct confbridge_user *user
struct conference_bridge_user *cbu -> struct confbridge_user *user
struct conference_bridge *conference_bridge -> struct confbridge_conference *conference
The names are now generally shorter, consistently used, and don't conflict
with the struct names.
This patch handles the renaming part of the issue.
(issue ASTERISK-20776)
Reported by: rmudgett
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@382764 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/confbridge/conf_config_parser.c')
| -rw-r--r-- | apps/confbridge/conf_config_parser.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c index 560bee4e1..83184d10a 100644 --- a/apps/confbridge/conf_config_parser.c +++ b/apps/confbridge/conf_config_parser.c @@ -1954,7 +1954,7 @@ const struct bridge_profile *conf_find_bridge_profile(struct ast_channel *chan, } struct dtmf_menu_hook_pvt { - struct conference_bridge_user *conference_bridge_user; + struct confbridge_user *user; struct conf_menu_entry menu_entry; struct conf_menu *menu; }; @@ -1975,7 +1975,7 @@ static void menu_hook_destroy(void *hook_pvt) static int menu_hook_callback(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel, void *hook_pvt) { struct dtmf_menu_hook_pvt *pvt = hook_pvt; - return conf_handle_dtmf(bridge_channel, pvt->conference_bridge_user, &pvt->menu_entry, pvt->menu); + return conf_handle_dtmf(bridge_channel, pvt->user, &pvt->menu_entry, pvt->menu); } static int copy_menu_entry(struct conf_menu_entry *dst, struct conf_menu_entry *src) @@ -2021,7 +2021,7 @@ int conf_find_menu_entry_by_sequence(const char *dtmf_sequence, struct conf_menu return 0; } -int conf_set_menu_to_user(const char *menu_name, struct conference_bridge_user *conference_bridge_user) +int conf_set_menu_to_user(const char *menu_name, struct confbridge_user *user) { struct conf_menu *menu; struct conf_menu_entry *menu_entry = NULL; @@ -2037,6 +2037,7 @@ int conf_set_menu_to_user(const char *menu_name, struct conference_bridge_user * ao2_lock(menu); AST_LIST_TRAVERSE(&menu->entries, menu_entry, entry) { struct dtmf_menu_hook_pvt *pvt; + if (!(pvt = ast_calloc(1, sizeof(*pvt)))) { ao2_unlock(menu); ao2_ref(menu, -1); @@ -2048,11 +2049,11 @@ int conf_set_menu_to_user(const char *menu_name, struct conference_bridge_user * ao2_ref(menu, -1); return -1; } - pvt->conference_bridge_user = conference_bridge_user; + pvt->user = user; ao2_ref(menu, +1); pvt->menu = menu; - ast_bridge_features_hook(&conference_bridge_user->features, pvt->menu_entry.dtmf, menu_hook_callback, pvt, menu_hook_destroy); + ast_bridge_features_hook(&user->features, pvt->menu_entry.dtmf, menu_hook_callback, pvt, menu_hook_destroy); } ao2_unlock(menu); |