From: Sigmund Augdal Helberg <sigmunau@videolan.org>
Date: Sun, 10 Apr 2005 14:44:52 +0000 (+0000)
Subject: playlist/item-ext.c: more elegant binary search in playlist_ItemGetById()
X-Git-Tag: 0.8.2~553
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=efaf656afeed5194a8601bf2db7bd636075703bf;p=vlc

playlist/item-ext.c: more elegant binary search in playlist_ItemGetById()
---

diff --git a/src/playlist/item-ext.c b/src/playlist/item-ext.c
index 37807abdfb..1072c7776a 100644
--- a/src/playlist/item-ext.c
+++ b/src/playlist/item-ext.c
@@ -464,15 +464,15 @@ playlist_item_t * playlist_ItemGetById( playlist_t * p_playlist , int i_id )
     i_bottom = 0; i_top = p_playlist->i_all_size;
     i = i_top / 2;
     while( p_playlist->pp_all_items[i]->input.i_id != i_id &&
-           i_top > i_bottom + 1 )
+           i_top > i_bottom )
     {
         if( p_playlist->pp_all_items[i]->input.i_id < i_id )
         {
-            i_bottom = i;
+            i_bottom = i + 1;
         }
         else
         {
-            i_top = i;
+            i_top = i - 1;
         }
         i = i_bottom + ( i_top - i_bottom ) / 2;
     }
@@ -480,10 +480,6 @@ playlist_item_t * playlist_ItemGetById( playlist_t * p_playlist , int i_id )
     {
         return p_playlist->pp_all_items[i];
     }
-    else if( p_playlist->pp_all_items[i_top]->input.i_id == i_id )
-    {
-        return p_playlist->pp_all_items[i_top];
-    }
         
     return NULL;
 }