[svn-commits] rmudgett: branch group/CCSS r248748 - /team/group/CCSS/main/ccss.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Feb 24 18:31:51 2010
New Revision: 248748

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=248748
Log:
Minor tweaks and unref the correct variable in a couple more places so astobj2 won't yell.

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

Modified: team/group/CCSS/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/main/ccss.c?view=diff&rev=248748&r1=248747&r2=248748
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Wed Feb 24 18:31:51 2010
@@ -2005,7 +2005,7 @@
 		}
 	}
 
-	cc_ref(cc_interfaces->interface_tree, "Bumping ref in case channel is hung up");
+	cc_ref(cc_interfaces->interface_tree, "Bumping CC interface tree ref in case channel is hung up");
 	ast_channel_unlock(inbound);
 
 	/* Yeah this kind of sucks, but luckily most people
@@ -2021,7 +2021,7 @@
 					core_instance->core_id, device_name);
 			AST_LIST_UNLOCK(cc_interfaces->interface_tree);
 			cc_unref(core_instance, "Returning early from ast_handle_cc_control_frame. Unref core_instance");
-			cc_unref(cc_interfaces, "Returning early from ast_handle_cc_control_frame. Unref cc_interfaces");
+			cc_unref(cc_interfaces->interface_tree, "Returning early from ast_handle_cc_control_frame. Unref CC interface tree");
 			call_destructor_with_no_monitor(cc_data->monitor_type, cc_data->private_data);
 			return;
 		}
@@ -2031,7 +2031,7 @@
 	if (!(monitor = cc_device_monitor_init(device_name, dialstring, cc_data, cc_interfaces->core_id))) {
 		ast_log(LOG_WARNING, "Unable to create CC device interface for '%s'. CC services will be unavailable on this interface.\n", device_name);
 		cc_unref(core_instance, "Returning early from ast_handle_cc_control_frame. Unref core_instance");
-		cc_unref(cc_interfaces, "Returning early from ast_handle_cc_control_frame. Unref cc_interfaces");
+		cc_unref(cc_interfaces->interface_tree, "Returning early from ast_handle_cc_control_frame. Unref CC interface tree");
 		call_destructor_with_no_monitor(cc_data->monitor_type, cc_data->private_data);
 		return;
 	}
@@ -2052,7 +2052,7 @@
 
 	cc_unref(core_instance, "Done with core_instance after handling CC control frame");
 	cc_unref(monitor, "Unref reference from allocating monitor");
-	cc_unref(cc_interfaces->interface_tree, "Done with cc_interfaces after handling CC control frame.");
+	cc_unref(cc_interfaces->interface_tree, "Done with CC interface tree after handling CC control frame.");
 }
 
 int ast_cc_call_init(struct ast_channel *chan, int *ignore_cc)
@@ -2545,8 +2545,8 @@
 	long agent_count;
 	int recall_core_id;
 
+	ast_channel_get_device_name(caller_chan, caller, sizeof(caller));
 	cc_params = ast_channel_get_cc_config_params(caller_chan);
-	ast_channel_get_device_name(caller_chan, caller, sizeof(caller));
 	if (!cc_params) {
 		ast_log_dynamic_level(cc_logger_level, "Could not get CC parameters for %s\n",
 			caller);