Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / libraries / liblmdb / midl.c

diff --git a/libraries/liblmdb/midl.c b/libraries/liblmdb/midl.c
index 86e4592d2dbcda7dbc2e3fda618980e584eff93a..efcaad47506030261bd301e8f46a9ad15ce7225f 100644 (file)
--- a/libraries/liblmdb/midl.c
+++ b/libraries/liblmdb/midl.c
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <assert.h>
 #include "midl.h"
 
 /** @defgroup internal MDB Internals
@@ -59,7 +58,7 @@ unsigned mdb_midl_search( MDB_IDL ids, MDB_ID id )
                        return cursor;
                }
        }
-       
+
        if( val > 0 ) {
                ++cursor;
        }
@@ -89,7 +88,7 @@ int mdb_midl_insert( MDB_IDL ids, MDB_ID id )
                /* no room */
                --ids[0];
                return -2;
-       
+
        } else {
                /* insert id */
                for (i=ids[0]; i>x; i--)
@@ -150,7 +149,7 @@ int mdb_midl_need( MDB_IDL *idp, unsigned num )
                num = (num + num/4 + (256 + 2)) & -256;
                if (!(ids = realloc(ids-1, num * sizeof(MDB_ID))))
                        return ENOMEM;
-               *ids++ = num -= 2;
+               *ids++ = num - 2;
                *idp = ids;
        }
        return 0;
@@ -203,7 +202,7 @@ int mdb_midl_append_range( MDB_IDL *idp, MDB_ID id, unsigned n )
 /* Quicksort + Insertion sort for small arrays */
 
 #define SMALL  8
-#define        SWAP(a,b)       { itmp=(a); (a)=(b); (b)=itmp; }
+#define        MIDL_SWAP(a,b)  { itmp=(a); (a)=(b); (b)=itmp; }
 
 void
 mdb_midl_sort( MDB_IDL ids )
@@ -231,15 +230,15 @@ mdb_midl_sort( MDB_IDL ids )
                        l = istack[jstack--];
                } else {
                        k = (l + ir) >> 1;      /* Choose median of left, center, right */
-                       SWAP(ids[k], ids[l+1]);
+                       MIDL_SWAP(ids[k], ids[l+1]);
                        if (ids[l] < ids[ir]) {
-                               SWAP(ids[l], ids[ir]);
+                               MIDL_SWAP(ids[l], ids[ir]);
                        }
                        if (ids[l+1] < ids[ir]) {
-                               SWAP(ids[l+1], ids[ir]);
+                               MIDL_SWAP(ids[l+1], ids[ir]);
                        }
                        if (ids[l] < ids[l+1]) {
-                               SWAP(ids[l], ids[l+1]);
+                               MIDL_SWAP(ids[l], ids[l+1]);
                        }
                        i = l+1;
                        j = ir;
@@ -248,7 +247,7 @@ mdb_midl_sort( MDB_IDL ids )
                                do i++; while(ids[i] > a);
                                do j--; while(ids[j] < a);
                                if (j < i) break;
-                               SWAP(ids[i],ids[j]);
+                               MIDL_SWAP(ids[i],ids[j]);
                        }
                        ids[l+1] = ids[j];
                        ids[j] = a;
@@ -306,7 +305,6 @@ int mdb_mid2l_insert( MDB_ID2L ids, MDB_ID2 *id )
        unsigned x, i;
 
        x = mdb_mid2l_search( ids, id->mid );
-       assert( x > 0 );
 
        if( x < 1 ) {
                /* internal error */