[svn-commits] mmichelson: branch group/CCSS r217872 - /team/group/CCSS/main/ccss.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Sep 10 17:06:03 2009
New Revision: 217872

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=217872
Log:
get rid of pointless function.


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

Modified: team/group/CCSS/main/ccss.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/CCSS/main/ccss.c?view=diff&rev=217872&r1=217871&r2=217872
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Thu Sep 10 17:06:03 2009
@@ -900,7 +900,7 @@
 	return new_monitor;
 }
 
-static void recursive_builder(struct ast_cc_interface *current_place, struct ast_cc_monitor *parent, const int core_id)
+static void interface_tree_to_monitor(struct ast_cc_interface *current_place, struct ast_cc_monitor *parent, const int core_id)
 {
 	struct ast_cc_interface *cc_interface = current_place;
 	struct ast_cc_monitor *monitor = find_or_create_monitor(parent, current_place, core_id);
@@ -919,15 +919,10 @@
 
 	while ((cc_interface = AST_LIST_NEXT(cc_interface, next))) {
 		if (cc_interface->parent_id == current_place->id) {
-			recursive_builder(cc_interface, monitor, core_id);
+			interface_tree_to_monitor(cc_interface, monitor, core_id);
 		}
 	}
 	ao2_ref(monitor, -1);
-}
-
-static void interface_tree_to_monitor(struct ast_cc_interface_tree *called_tree, struct cc_core_instance *core_instance)
-{
-	recursive_builder(AST_LIST_FIRST(called_tree), root_monitor, core_instance->core_id);
 }
 
 static int cc_monitor_tree_init(const int core_id)
@@ -941,7 +936,8 @@
 
 	ast_assert(core_instance->monitor == NULL);
 
-	interface_tree_to_monitor(core_instance->agent->interface_tree, core_instance);
+	interface_tree_to_monitor(AST_LIST_FIRST(core_instance->agent->interface_tree),
+			root_monitor, core_instance->core_id);
 	core_instance->monitor = root_monitor;
 
 	ao2_ref(core_instance, -1);