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

1 files changed, 19 insertions, 19 deletions

diff --git a/apps/confbridge/conf_state_single_marked.c b/apps/confbridge/conf_state_single_marked.c
index a7ac57816..340245831 100644
--- a/apps/confbridge/conf_state_single_marked.c
+++ b/apps/confbridge/conf_state_single_marked.c
@@ -35,12 +35,12 @@
 #include "include/confbridge.h"
 #include "include/conf_state.h"
 
-static void join_active(struct conference_bridge_user *cbu);
-static void join_marked(struct conference_bridge_user *cbu);
-static void leave_marked(struct conference_bridge_user *cbu);
-static void transition_to_single_marked(struct conference_bridge_user *cbu);
+static void join_active(struct confbridge_user *user);
+static void join_marked(struct confbridge_user *user);
+static void leave_marked(struct confbridge_user *user);
+static void transition_to_single_marked(struct confbridge_user *user);
 
-struct conference_state STATE_SINGLE_MARKED = {
+struct confbridge_state STATE_SINGLE_MARKED = {
 	.name = "SINGLE_MARKED",
 	.join_unmarked = join_active,
 	.join_waitmarked = join_active,
@@ -48,32 +48,32 @@ struct conference_state STATE_SINGLE_MARKED = {
 	.leave_marked = leave_marked,
 	.entry = transition_to_single_marked,
 };
-struct conference_state *CONF_STATE_SINGLE_MARKED = &STATE_SINGLE_MARKED;
+struct confbridge_state *CONF_STATE_SINGLE_MARKED = &STATE_SINGLE_MARKED;
 
-static void join_active(struct conference_bridge_user *cbu)
+static void join_active(struct confbridge_user *user)
 {
-	conf_add_user_active(cbu->conference_bridge, cbu);
-	conf_handle_second_active(cbu->conference_bridge);
+	conf_add_user_active(user->conference, user);
+	conf_handle_second_active(user->conference);
 
-	conf_change_state(cbu, CONF_STATE_MULTI_MARKED);
+	conf_change_state(user, CONF_STATE_MULTI_MARKED);
 }
 
-static void join_marked(struct conference_bridge_user *cbu)
+static void join_marked(struct confbridge_user *user)
 {
-	conf_add_user_marked(cbu->conference_bridge, cbu);
-	conf_handle_second_active(cbu->conference_bridge);
+	conf_add_user_marked(user->conference, user);
+	conf_handle_second_active(user->conference);
 
-	conf_change_state(cbu, CONF_STATE_MULTI_MARKED);
+	conf_change_state(user, CONF_STATE_MULTI_MARKED);
 }
 
-static void leave_marked(struct conference_bridge_user *cbu)
+static void leave_marked(struct confbridge_user *user)
 {
-	conf_remove_user_marked(cbu->conference_bridge, cbu);
+	conf_remove_user_marked(user->conference, user);
 
-	conf_change_state(cbu, CONF_STATE_EMPTY);
+	conf_change_state(user, CONF_STATE_EMPTY);
 }
 
-static void transition_to_single_marked(struct conference_bridge_user *cbu)
+static void transition_to_single_marked(struct confbridge_user *user)
 {
-	conf_mute_only_active(cbu->conference_bridge);
+	conf_mute_only_active(user->conference);
 }