[asterisk-commits] russell: branch russell/ast_channel_ao2 r183549 - in /team/russell/ast_channe...

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Mar 20 09:30:16 2009
New Revision: 183549

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=183549
Log:
A couple of updates from Mark's review

Modified:
    team/russell/ast_channel_ao2/build_tools/cflags.xml
    team/russell/ast_channel_ao2/funcs/func_global.c

Modified: team/russell/ast_channel_ao2/build_tools/cflags.xml
URL: http://svn.digium.com/svn-view/asterisk/team/russell/ast_channel_ao2/build_tools/cflags.xml?view=diff&rev=183549&r1=183548&r2=183549
==============================================================================
--- team/russell/ast_channel_ao2/build_tools/cflags.xml (original)
+++ team/russell/ast_channel_ao2/build_tools/cflags.xml Fri Mar 20 09:30:16 2009
@@ -30,8 +30,6 @@
 		<member name="TEST_TANDEM_TRANSCODING" displayname="New ulaw/alaw codec, turn on transcoding tests on init">
 			<depend>G711_NEW_ALGORITHM</depend>
 		</member>
-		<member name="DEBUG_CHANNEL_LOCKS" displayname="Debug Channel Locking">
-		</member>
 		<member name="MALLOC_DEBUG" displayname="Keep Track of Memory Allocations">
 		</member>
 		<member name="BUSYDETECT_TONEONLY" displayname="Enable additional comparision of only the tone duration not the silence part">

Modified: team/russell/ast_channel_ao2/funcs/func_global.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/ast_channel_ao2/funcs/func_global.c?view=diff&rev=183549&r1=183548&r2=183549
==============================================================================
--- team/russell/ast_channel_ao2/funcs/func_global.c (original)
+++ team/russell/ast_channel_ao2/funcs/func_global.c Fri Mar 20 09:30:16 2009
@@ -151,10 +151,9 @@
 			return -1;
 		}
 		chan = c_ref;
-		ast_channel_lock(chan);
-	} else {
-		ast_channel_lock(chan);
-	}
+	}
+
+	ast_channel_lock(chan);
 
 	if (!(varstore = ast_channel_datastore_find(chan, &shared_variable_info, NULL))) {
 		ast_channel_unlock(chan);
@@ -210,10 +209,9 @@
 			return -1;
 		}
 		chan = c_ref;
-		ast_channel_lock(chan);
-	} else {
-		ast_channel_lock(chan);
-	}
+	}
+
+	ast_channel_lock(chan);
 
 	if (!(varstore = ast_channel_datastore_find(chan, &shared_variable_info, NULL))) {
 		if (!(varstore = ast_datastore_alloc(&shared_variable_info, NULL))) {