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

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Feb 25 11:11:30 2010
New Revision: 248754

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=248754
Log:
sync with trunk

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=248754&r1=248753&r2=248754
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Thu Feb 25 11:11:30 2010
@@ -3074,7 +3074,7 @@
 		return 0;
 	}
 
-	interface_tree = cc_ref(recall_data->interface_tree, "Bump refcount for tree while we search for specific channel");
+	interface_tree = recall_data->interface_tree;
 	ast_channel_get_device_name(chan, device_name, sizeof(device_name));
 	/* We grab the value of the recall_data->core_id so that we
 	 * can unlock the channel before we start looking through the
@@ -3095,12 +3095,10 @@
 			/* BOOM! Device is in the tree! We have a winner! */
 			*core_id = core_id_candidate;
 			AST_LIST_UNLOCK(interface_tree);
-			cc_unref(interface_tree, "Found a match in recall tree.");
 			return 1;
 		}
 	}
 	AST_LIST_UNLOCK(interface_tree);
-	cc_unref(interface_tree, "No match in recall tree.");
 	return 0;
 }
 
@@ -3220,7 +3218,7 @@
 		return -1;
 	}
 	recall_data = recall_datastore->data;
-	interface_tree = cc_ref(recall_data->interface_tree, "Getting ref of recall monitor tree");
+	interface_tree = recall_data->interface_tree;
 	core_id = recall_data->core_id;
 	ast_channel_unlock(chan);
 
@@ -3233,7 +3231,6 @@
 	ast_log_dynamic_level(cc_logger_level, "Core %d: CC_INTERFACES set to %s\n",
 			core_id, ast_str_buffer(str));
 
-	cc_unref(interface_tree, "Done with monitor tree while setting CC_INTERFACES");
 	ast_free(str);
 	return 0;
 }
@@ -3258,7 +3255,7 @@
 		return -1;
 	}
 	recall_data = recall_datastore->data;
-	interface_tree = cc_ref(recall_data->interface_tree, "Get reference to recall data monitor tree");
+	interface_tree = recall_data->interface_tree;
 	core_id = recall_data->core_id;
 	ast_channel_unlock(chan);
 
@@ -3275,7 +3272,6 @@
 		 * the admin has changed a CC_INTERFACES variable at some point.
 		 */
 		AST_LIST_UNLOCK(interface_tree);
-		cc_unref(interface_tree, "Couldn't find the extension specified");
 		ast_free(str);
 		return -1;
 	}
@@ -3287,7 +3283,6 @@
 	ast_log_dynamic_level(cc_logger_level, "Core %d: CC_INTERFACES set to %s\n",
 			core_id, ast_str_buffer(str));
 
-	cc_unref(interface_tree, "Done writing the CC_INTERFACES channel variable");
 	ast_free(str);
 	return 0;
 }