[svn-commits] russell: branch 1.6.0 r109840 - in /branches/1.6.0: ./ main/utils.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Mar 18 23:06:56 2008
New Revision: 109840

URL: http://svn.digium.com/view/asterisk?view=rev&rev=109840
Log:
Merged revisions 109839 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r109839 | russell | 2008-03-18 23:06:31 -0500 (Tue, 18 Mar 2008) | 10 lines

Merged revisions 109838 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r109838 | russell | 2008-03-18 23:06:05 -0500 (Tue, 18 Mar 2008) | 2 lines

Tweak spacing in a recent change because I'm very picky.

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/utils.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/utils.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/utils.c?view=diff&rev=109840&r1=109839&r2=109840
==============================================================================
--- branches/1.6.0/main/utils.c (original)
+++ branches/1.6.0/main/utils.c Tue Mar 18 23:06:56 2008
@@ -611,7 +611,7 @@
 		return;
 	}
 
-	if (i && lock_info->locks[i-1].pending == -1) {
+	if (i && lock_info->locks[i - 1].pending == -1) {
 		/* The last lock on the list was one that this thread tried to lock but
 		 * failed at doing so.  It has now moved on to something else, so remove
 		 * the old lock from the list. */