[asterisk-commits] mmichelson: branch group/CCSS_Monitor_Restructure r242042 - /team/group/CCSS_...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Jan 21 15:05:17 2010
New Revision: 242042

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=242042
Log:
Remove unused status_response callbacks.


Modified:
    team/group/CCSS_Monitor_Restructure/main/ccss.c

Modified: team/group/CCSS_Monitor_Restructure/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS_Monitor_Restructure/main/ccss.c?view=diff&rev=242042&r1=242041&r2=242042
==============================================================================
--- team/group/CCSS_Monitor_Restructure/main/ccss.c (original)
+++ team/group/CCSS_Monitor_Restructure/main/ccss.c Thu Jan 21 15:05:17 2010
@@ -901,7 +901,6 @@
 	AST_DLLIST_ENTRY(cc_monitor) next;
 };
 
-static int cc_extension_monitor_status_response(struct ast_cc_monitor *monitor, const int core_id, enum ast_device_state devstate);
 static int cc_extension_monitor_unsuspend(struct ast_cc_monitor *monitor, const int core_id);
 
 static struct ast_cc_monitor_callbacks extension_monitor_cbs = {
@@ -909,23 +908,6 @@
 	.status_response = cc_extension_monitor_status_response,
 	.unsuspend = cc_extension_monitor_unsuspend,
 };
-
-static int cc_extension_monitor_status_response(struct ast_cc_monitor *monitor, const int core_id, enum ast_device_state devstate)
-{
-	/* So, for an extension monitor, a status request involves traversing all child links that have
-	 * the proper core_id. As soon as ONE of them returns AST_DEVICE_NOT_INUSE, this means that as
-	 * far as CC is concerned, the entire extension monitor itself is not in use, so go ahead
-	 * and return that status.
-	 */
-	struct ast_cc_monitor_link *link;
-
-	AST_LIST_TRAVERSE(&monitor->child_links, link, next_child) {
-		if (link->core_id == core_id) {
-			link->child->callbacks->status_response(link->child, core_id, devstate);
-		}
-	}
-	return 0;
-}
 
 static int cc_extension_monitor_unsuspend(struct ast_cc_monitor *monitor, const int core_id)
 {
@@ -944,7 +926,6 @@
 
 static int cc_generic_monitor_request_cc2(struct cc_monitor *monitor, int *available_timer_id);
 static int cc_generic_monitor_suspend2(struct cc_monitor *monitor);
-static int cc_generic_monitor_status_response(struct ast_cc_monitor *monitor, const int core_id, enum ast_device_state devstate);
 static int cc_generic_monitor_status_response2(struct cc_monitor *monitor, enum ast_device_state devstate);
 static int cc_generic_monitor_unsuspend2(struct cc_monitor *monitor);
 static int cc_generic_monitor_cancel_available_timer2(struct cc_monitor *monitor, int *sched_id);
@@ -1226,15 +1207,6 @@
 	 * If this somehow gets called, something really fishy is going on.
 	 */
 	ast_log(LOG_WARNING, "Why has a generic monitor's status_response callback been called? CoreID is %d\n", monitor->core_id);
-	return 0;
-}
-
-static int cc_generic_monitor_status_response(struct ast_cc_monitor *monitor, const int core_id, enum ast_device_state devstate)
-{
-	/* The generic monitor will never issue a status request of the other side's agent.
-	 * If this somehow gets called, something really fishy is going on.
-	 */
-	ast_log(LOG_WARNING, "Why has a generic monitor's status_response callback been called? CoreID is %d\n", core_id);
 	return 0;
 }