[asterisk-commits] twilson: branch twilson/config_work r362142 - /team/twilson/config_work/apps/

[SVN commits to the Asterisk project]

Author: twilson
Date: Sat Apr 14 20:49:58 2012
New Revision: 362142

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=362142
Log:
Remove some unnecessary code, debug LOG_NOTICEs

Modified:
    team/twilson/config_work/apps/app_skel.c

Modified: team/twilson/config_work/apps/app_skel.c
URL: http://svnview.digium.com/svn/asterisk/team/twilson/config_work/apps/app_skel.c?view=diff&rev=362142&r1=362141&r2=362142
==============================================================================
--- team/twilson/config_work/apps/app_skel.c (original)
+++ team/twilson/config_work/apps/app_skel.c Sat Apr 14 20:49:58 2012
@@ -221,22 +221,12 @@
 	return strcasecmp(one->name, match) ? 0 : (CMP_MATCH | CMP_STOP);
 }
 
-static struct ao2_container *skel_pvt_container_alloc(void)
-{
-	return ao2_container_alloc(PVT_BUCKETS, skel_pvt_hash, skel_pvt_cmp);
-}
-
-static struct ao2_container *skel_pvt_cfg_container_alloc(void)
-{
-	return ao2_container_alloc(PVT_BUCKETS, skel_pvt_config_hash, skel_pvt_config_cmp);
-}
-
 static int skel_containers_alloc(struct ao2_container **newpvts, struct ao2_container **newcfgs)
 {
-	if (!(*newpvts = skel_pvt_container_alloc())) {
+	if (!(*newpvts = ao2_container_alloc(PVT_BUCKETS, skel_pvt_hash, skel_pvt_cmp))) {
 		return -1;
 	}
-	if (!(*newcfgs = skel_pvt_cfg_container_alloc())) {
+	if (!(*newcfgs = ao2_container_alloc(PVT_BUCKETS, skel_pvt_config_hash, skel_pvt_config_cmp))) {
 		ao2_ref(*newpvts, -1);
 		*newpvts = NULL;
 		return -1;
@@ -510,12 +500,10 @@
 	}
 
 	if (!(global_type = aco_type_global_alloc("global", CONTEXT_ALLOW, "general", (aco_type_alloc) skel_global_alloc))) {
-		ast_log(LOG_ERROR, "3\n");
 		goto error;
 	}
 
 	if (!(priv_type = aco_type_private_alloc("private", CONTEXT_DENY, "general", NULL, NULL, (aco_type_alloc) skel_pvt_cfg_alloc, skel_containers_alloc, skel_find_or_create_pvt, skel_find_pvt, NULL, NULL))) {
-		ast_log(LOG_ERROR, "4\n");
 		goto error;
 	}
 
@@ -539,7 +527,6 @@
 	ast_mutex_lock(&reload_lock);
 	if (aco_process_config(&cfg_info, 0)) {
 		ast_mutex_unlock(&reload_lock);
-		ast_log(LOG_ERROR, "5\n");
 		goto error;
 	}
 	ast_mutex_unlock(&reload_lock);