[asterisk-commits] kpfleming: trunk r40789 - /trunk/main/pbx.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Mon Aug 21 15:04:59 2006
New Revision: 40789

URL: http://svn.digium.com/view/asterisk?rev=40789&view=rev
Log:
don't initialize global variables list twice

Modified:
    trunk/main/pbx.c

Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?rev=40789&r1=40788&r2=40789&view=diff
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Mon Aug 21 15:04:59 2006
@@ -238,7 +238,7 @@
 static int pbx_builtin_importvar(struct ast_channel *, void *);
 
 AST_MUTEX_DEFINE_STATIC(globalslock);
-static struct varshead globals;
+static struct varshead globals = AST_LIST_HEAD_NOLOCK_INIT_VALUE;
 
 static int autofallthrough = 0;
 
@@ -5681,7 +5681,6 @@
 		ast_verbose( "Asterisk PBX Core Initializing\n");
 		ast_verbose( "Registering builtin applications:\n");
 	}
-	AST_LIST_HEAD_INIT_NOLOCK(&globals);
 	ast_cli_register_multiple(pbx_cli, sizeof(pbx_cli) / sizeof(pbx_cli[0]));
 
 	/* Register builtin applications */