Ticket #3327: wince-missing.patch

backends/platform/wince/missing/missing.cpp

@@ -40 +40 @@
 
 void *bsearch(const void *key, const void *base, size_t nmemb,
                           size_t size, int (*compar)(const void *, const void *)) {
-        size_t i;
+        // Perform binary search
+        size_t lo = 0;
+        size_t hi = nmemb;
+        while (lo < hi) {
+                size_t mid = (lo + hi) / 2;
+                const void *p = ((const char *)base) + mid * size;
+                int tmp = (*compar)(key, p);
+                if (tmp < 0)
+                        hi = mid;
+                else if (tmp > 0)
+                        lo = mid + 1;
+                else
+                        return (void *)p;
+        }
 
-        for (i=0; i<nmemb; i++)
-                if (compar(key, (void*)((size_t)base + size * i)) == 0)
-                        return (void*)((size_t)base + size * i);
         return NULL;
 }
 
@@ -465 +475 @@
 }
 
 char *strpbrk(const char *s, const char *accept) {
-        int i;
-
         if (!s || !accept)
                 return NULL;
 
-        for (i=0; i<strlen(s); i++) {
-                int j;
-                for (j=0; j<strlen(accept); j++)
-                        if (s[i] == accept[j])
-                                return (char*)&s[i];
+        for (; *s != 0; ++s) {
+                for (const char *a = accept; *a != 0; ++a) {
+                        if (*s == *a)
+                                return (char *)s;
+                }
         }
 
         return NULL;