From DONOTREPLY at icculus.org  Wed Oct 12 18:03:28 2005
From: DONOTREPLY at icculus.org (DONOTREPLY at icculus.org)
Date: 12 Oct 2005 18:03:28 -0400
Subject: r773 - trunk
Message-ID: <20051012220328.5166.qmail@icculus.org>

Author: icculus
Date: 2005-10-12 18:03:28 -0400 (Wed, 12 Oct 2005)
New Revision: 773

Modified:
   trunk/CHANGELOG
   trunk/CREDITS
   trunk/physfs.c
Log:
Fixed version of locateInStringList() from Matze Braun.


Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	2005-09-20 04:01:36 UTC (rev 772)
+++ trunk/CHANGELOG	2005-10-12 22:03:28 UTC (rev 773)
@@ -2,6 +2,7 @@
  * CHANGELOG.
  */
 
+10122005 - Fixed locateInStringList() in physfs.c (thanks, Matze!).
 09192005 - Make unix mutexes recursive above pthread layer...fixes deadlock on
            MacOS X, for now.
 09182005 - API BREAKAGE: PHYSFS_enumerateFilesCallback() now passes the

Modified: trunk/CREDITS
===================================================================
--- trunk/CREDITS	2005-09-20 04:01:36 UTC (rev 772)
+++ trunk/CREDITS	2005-10-12 22:03:28 UTC (rev 773)
@@ -84,7 +84,8 @@
 MPW support:
     Chris Taylor
 
-Mingw support:
+Mingw support,
+General bug fixes:
     Matze Braun
 
 Bug fixes:

Modified: trunk/physfs.c
===================================================================
--- trunk/physfs.c	2005-09-20 04:01:36 UTC (rev 772)
+++ trunk/physfs.c	2005-10-12 22:03:28 UTC (rev 773)
@@ -1459,37 +1459,30 @@
                               char **list,
                               PHYSFS_uint32 *pos)
 {
-    PHYSFS_uint32 hi = *pos - 1;
+    PHYSFS_uint32 len = *pos;
+    PHYSFS_uint32 half_len;
     PHYSFS_uint32 lo = 0;
-    PHYSFS_uint32 i = hi >> 1;
+    PHYSFS_uint32 middle;
     int cmp;
 
-    assert(*pos != 0);  /* this doesn't work with empty lists! */
-
-    while (hi != lo)
+    while (len > 0)
     {
-        cmp = strcmp(list[i], str);
+        half_len = len >> 1;
+        middle = lo + half_len;
+        cmp = strcmp(list[middle], str);
+
         if (cmp == 0)  /* it's in the list already. */
             return(1);
-        else if (cmp < 0)
-        {
-            hi = i;
-            i = lo + ((hi - lo) >> 1);
-        } /* else if */
+        else if (cmp > 0)
+            len = half_len;
         else
         {
-            lo = i + 1;
-            i = lo + ((1 + hi - lo) >> 1);
+            lo = middle + 1;
+            len -= half_len + 1;
         } /* else */
     } /* while */
 
-    /* hi == lo, check it in case it's the match... */
-    cmp = strcmp(list[lo], str);
-    if (cmp == 0)
-        return(1);
-
-    /* not in the list, set insertion point... */
-    *pos = (cmp < 0) ? lo : lo + 1;
+    *pos = lo;
     return(0);
 } /* locateInStringList */
 
@@ -1506,11 +1499,8 @@
      *  alphabetically...
      */
     pos = pecd->size;
-    if (pos > 0)
-    {
-        if (locateInStringList(str, pecd->list, &pos))
-            return;  /* already in the list. */
-    } /* if */
+    if (locateInStringList(str, pecd->list, &pos))
+        return;  /* already in the list. */
 
     ptr = allocator.Realloc(pecd->list, (pecd->size + 2) * sizeof (char *));
     newstr = (char *) allocator.Malloc(strlen(str) + 1);



From DONOTREPLY at icculus.org  Wed Oct 12 18:03:56 2005
From: DONOTREPLY at icculus.org (DONOTREPLY at icculus.org)
Date: 12 Oct 2005 18:03:56 -0400
Subject: r774 - in trunk: . archivers
Message-ID: <20051012220356.5306.qmail@icculus.org>

Author: icculus
Date: 2005-10-12 18:03:56 -0400 (Wed, 12 Oct 2005)
New Revision: 774

Modified:
   trunk/CHANGELOG
   trunk/archivers/wad.c
Log:
Patched archivers/wad.c to compile again.


Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	2005-10-12 22:03:28 UTC (rev 773)
+++ trunk/CHANGELOG	2005-10-12 22:03:56 UTC (rev 774)
@@ -2,7 +2,8 @@
  * CHANGELOG.
  */
 
-10122005 - Fixed locateInStringList() in physfs.c (thanks, Matze!).
+10122005 - Fixed locateInStringList() in physfs.c (thanks, Matze!). Patched
+           archivers/wad.c to compile.
 09192005 - Make unix mutexes recursive above pthread layer...fixes deadlock on
            MacOS X, for now.
 09182005 - API BREAKAGE: PHYSFS_enumerateFilesCallback() now passes the

Modified: trunk/archivers/wad.c
===================================================================
--- trunk/archivers/wad.c	2005-10-12 22:03:28 UTC (rev 773)
+++ trunk/archivers/wad.c	2005-10-12 22:03:56 UTC (rev 774)
@@ -350,7 +350,7 @@
             if (sep != NULL)
             {
                 if (strncmp(dname, name, (sep - name)) == 0)
-                    cb(callbackdata, sep + 1);
+                    cb(callbackdata, origdir, sep + 1);
             } /* if */
         } /* for */
     } /* else */