[asterisk-commits] mmichelson: branch group/CCSS r226810 - in /team/group/CCSS: include/asterisk...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Nov  2 10:55:02 2009
New Revision: 226810

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=226810
Log:
Change ast_cc_monitor_announce_availability to ast_cc_callee_available.

There are two reasons for this change. One is that the old name was
somewhat long and could stand to be shortened. The second is that
the new name aligns better with ast_cc_caller_available and ast_cc_caller_unavailable.


Modified:
    team/group/CCSS/include/asterisk/ccss.h
    team/group/CCSS/main/ccss.c

Modified: team/group/CCSS/include/asterisk/ccss.h
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/include/asterisk/ccss.h?view=diff&rev=226810&r1=226809&r2=226810
==============================================================================
--- team/group/CCSS/include/asterisk/ccss.h (original)
+++ team/group/CCSS/include/asterisk/ccss.h Mon Nov  2 10:55:02 2009
@@ -1008,7 +1008,7 @@
  * \retval 0 Request successfully queued
  * \retval -1 Request could not be queued
  */
-int ast_cc_monitor_announce_availability(struct ast_cc_monitor *monitor);
+int ast_cc_callee_available(struct ast_cc_monitor *monitor);
 
 /* END API FOR USE WITH/BY MONITORS */
 

Modified: team/group/CCSS/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/main/ccss.c?view=diff&rev=226810&r1=226809&r2=226810
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Mon Nov  2 10:55:02 2009
@@ -978,7 +978,7 @@
 	gen_mon_pvt->current_state = new_state;
 
 	if (new_state == AST_DEVICE_NOT_INUSE) {
-		ast_cc_monitor_announce_availability(monitor);
+		ast_cc_callee_available(monitor);
 	}
 	cc_unref(monitor, "Kill reference from generic_monitor_devstate_cb");
 	ast_free(gtcd);
@@ -1080,7 +1080,7 @@
 	 */
 	if (service == AST_CC_CCBS && gen_mon_pvt->current_state == AST_DEVICE_NOT_INUSE) {
 		ast_cc_request_acknowledged(core_id, "Formality. Device is already available but we have to go through the motions\n");
-		return ast_cc_monitor_announce_availability(monitor);
+		return ast_cc_callee_available(monitor);
 	}
 
 	when = service == AST_CC_CCBS ? ast_get_ccbs_available_timer(monitor->interface->config_params) :
@@ -1109,7 +1109,7 @@
 		 */
 		monitor->saved_link = NULL;
 		if (ast_device_state(monitor->interface->name) == AST_DEVICE_NOT_INUSE) {
-			ast_cc_monitor_announce_availability(monitor);
+			ast_cc_callee_available(monitor);
 		}
 	}
 	return 0;
@@ -1131,7 +1131,7 @@
 	 * immediate state change
 	 */
 	if (ast_device_state(monitor->interface->name) == AST_DEVICE_NOT_INUSE) {
-		ast_cc_monitor_announce_availability(monitor);
+		ast_cc_callee_available(monitor);
 	}
 	return 0;
 }
@@ -2298,7 +2298,7 @@
  * lists or links.
  *
  * Note that the monitor passed to this function has had
- * its refcount increased by ast_cc_monitor_announce_availability,
+ * its refcount increased by ast_cc_callee_available,
  * so it is essential that the refcount is decremented prior
  * to returning.
  *
@@ -2311,7 +2311,7 @@
 
 	if (link && !link->is_suspended) {
 		pass_availability_up(link->parent, link->core_id);
-		cc_unref(monitor, "Kill reference from ast_cc_monitor_announce_availabilty");
+		cc_unref(monitor, "Kill reference from ast_cc_callee_available");
 		return 0;
 	}
 
@@ -2332,7 +2332,7 @@
 		 * are suspended. Either way, this isn't a particularly big
 		 * deal.
 		 */
-		cc_unref(monitor, "Kill reference from ast_cc_monitor_announce_availabilty");
+		cc_unref(monitor, "Kill reference from ast_cc_callee_available");
 		return 0;
 	}
 
@@ -2343,7 +2343,7 @@
 		link->core_id, monitor->interface->name
 	);
 	pass_availability_up(link->parent, link->core_id);
-	cc_unref(monitor, "Kill reference from ast_cc_monitor_announce_availabilty");
+	cc_unref(monitor, "Kill reference from ast_cc_callee_available");
 	return 0;
 }
 
@@ -2624,7 +2624,7 @@
 	return cc_request_state_change(CC_ACTIVE, core_id, debug);
 }
 
-int ast_cc_monitor_announce_availability(struct ast_cc_monitor *monitor) {
+int ast_cc_callee_available(struct ast_cc_monitor *monitor) {
 	return ast_taskprocessor_push(cc_core_taskprocessor, cc_devstate_change,
 			cc_ref(monitor, "Bump reference count until cc_devstate_change executes"));
 }