[svn-commits] jpeeler: branch 1.6.1 r238585 - in /branches/1.6.1: ./ main/features.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Fri Jan  8 11:19:37 2010
New Revision: 238585

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

........
  r238583 | jpeeler | 2010-01-08 11:18:41 -0600 (Fri, 08 Jan 2010) | 5 lines
  
  Stop trying to find a parking space after traversing the parkinglot one time.
  
  (closes issue #16428)
  Reported by: Yasuhiro Konishi
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/features.c

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

Modified: branches/1.6.1/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/features.c?view=diff&rev=238585&r1=238584&r2=238585
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Fri Jan  8 11:19:37 2010
@@ -566,7 +566,7 @@
 		for (i = start; 1; i++) {
 			if (i == parkinglot->parking_stop + 1) {
 				i = parkinglot->parking_start - 1;
-				continue;
+				break;
 			}
 
 			AST_LIST_TRAVERSE(&parkinglot->parkings, cur, list) {
@@ -574,8 +574,7 @@
 					break;
 				}
 			}
-
-			if (!cur || i == start - 1) {
+			if (!cur) {
 				parking_space = i;
 				break;
 			}