]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 238583 via svnmerge from
authorJeff Peeler <jpeeler@digium.com>
Fri, 8 Jan 2010 17:19:37 +0000 (17:19 +0000)
committerJeff Peeler <jpeeler@digium.com>
Fri, 8 Jan 2010 17:19:37 +0000 (17:19 +0000)
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
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@238585 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/features.c

index 4bfef4e345e512e99ae5a7f6a0d07b55e8cc4447..5dc41288ebfe9ffef29ec49f38f009d13d78e9aa 100644 (file)
@@ -566,7 +566,7 @@ static struct parkeduser *park_space_reserve(struct ast_channel *chan,
                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 @@ static struct parkeduser *park_space_reserve(struct ast_channel *chan,
                                        break;
                                }
                        }
-
-                       if (!cur || i == start - 1) {
+                       if (!cur) {
                                parking_space = i;
                                break;
                        }