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

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Jan 21 10:52:17 2010
New Revision: 242022

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=242022
Log:
Remove unused code.


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=242022&r1=242021&r2=242022
==============================================================================
--- team/group/CCSS_Monitor_Restructure/main/ccss.c (original)
+++ team/group/CCSS_Monitor_Restructure/main/ccss.c Thu Jan 21 10:52:17 2010
@@ -931,8 +931,6 @@
 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 int cc_extension_monitor_cancel_available_timer(struct ast_cc_monitor *monitor, const int core_id, int *sched_id);
-static void cc_extension_monitor_destructor(struct ast_cc_monitor *monitor);
-static void cc_extension_monitor_instance_destructor(const int core_id);
 
 static struct ast_cc_monitor_callbacks extension_monitor_cbs = {
 	.type = "extension",
@@ -940,8 +938,6 @@
 	.status_response = cc_extension_monitor_status_response,
 	.unsuspend = cc_extension_monitor_unsuspend,
 	.cancel_available_timer = cc_extension_monitor_cancel_available_timer,
-	.destructor = cc_extension_monitor_destructor,
-	.instance_destructor = cc_extension_monitor_instance_destructor,
 };
 
 static int cc_butt_extension_monitor_init(struct ast_cc_monitor *monitor, const int core_id)
@@ -995,17 +991,6 @@
 	return 0;
 }
 
-static void cc_extension_monitor_destructor(struct ast_cc_monitor *monitor)
-{
-	ast_log_dynamic_level(cc_logger_level, "Destructor called for monitor %s\n",
-		monitor->interface->name);
-}
-
-static void cc_extension_monitor_instance_destructor(const int core_id)
-{
-	/* Nothing special to do in this case */
-}
-
 static int cc_generic_monitor_init(struct ast_cc_monitor *monitor, const int core_id);
 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);
@@ -1013,8 +998,6 @@
 static int cc_generic_monitor_unsuspend2(struct cc_monitor *monitor);
 static int cc_generic_monitor_cancel_available_timer(struct ast_cc_monitor *monitor, const int core_id, int *sched_id);
 static void cc_generic_monitor_destructor2(void *private_data);
-static void cc_generic_monitor_destructor(struct ast_cc_monitor *monitor);
-static void cc_generic_monitor_instance_destructor(const int core_id);
 
 static struct ast_cc_monitor_callbacks generic_monitor_cbs = {
 	.type = "generic",
@@ -1025,8 +1008,6 @@
 	.unsuspend2 = cc_generic_monitor_unsuspend2,
 	.cancel_available_timer = cc_generic_monitor_cancel_available_timer,
 	.destructor2 = cc_generic_monitor_destructor2,
-	.destructor = cc_generic_monitor_destructor,
-	.instance_destructor = cc_generic_monitor_instance_destructor,
 };
 
 struct ao2_container *generic_monitors;
@@ -1343,22 +1324,6 @@
 	}
 	AST_LIST_TRAVERSE_SAFE_END;
 	cc_unref(generic_list, "Done with generic list in generic monitor destructor");
-}
-
-static void cc_generic_monitor_destructor(struct ast_cc_monitor *monitor)
-{
-	struct generic_monitor_pvt *gen_mon_pvt = monitor->private_data;
-
-	ast_log_dynamic_level(cc_logger_level, "Destroying generic monitor private\n");
-	if (gen_mon_pvt && gen_mon_pvt->sub) {
-		gen_mon_pvt->sub = ast_event_unsubscribe(gen_mon_pvt->sub);
-	}
-	ast_free(gen_mon_pvt);
-}
-
-static void cc_generic_monitor_instance_destructor(const int core_id)
-{
-	/* Move along.  Move along.  Nothing to do here. */
 }
 
 /*!