Drop unused liblmdb MIDL-range support.

diff --git a/libraries/liblmdb/midl.c b/libraries/liblmdb/midl.c
index 57f1e049a27f6d86c1fe71b2fceea600818096bc..d2617c61e45841719ebb953eb74bafb42748d7d2 100644 (file)
--- a/libraries/liblmdb/midl.c
+++ b/libraries/liblmdb/midl.c
@@ -71,17 +71,6 @@ int mdb_midl_insert( MDB_IDL ids, MDB_ID id )
 {
        unsigned x, i;
 
-       if (MDB_IDL_IS_RANGE( ids )) {
-               /* if already in range, treat as a dup */
-               if (id >= MDB_IDL_RANGE_FIRST(ids) && id <= MDB_IDL_RANGE_LAST(ids))
-                       return -1;
-               if (id < MDB_IDL_RANGE_FIRST(ids))
-                       ids[1] = id;
-               else if (id > MDB_IDL_RANGE_LAST(ids))
-                       ids[2] = id;
-               return 0;
-       }
-
        x = mdb_midl_search( ids, id );
        assert( x > 0 );
 
@@ -97,15 +86,9 @@ int mdb_midl_insert( MDB_IDL ids, MDB_ID id )
        }
 
        if ( ++ids[0] >= MDB_IDL_DB_MAX ) {
-               if( id < ids[1] ) {
-                       ids[1] = id;
-                       ids[2] = ids[ids[0]-1];
-               } else if ( ids[ids[0]-1] < id ) {
-                       ids[2] = id;
-               } else {
-                       ids[2] = ids[ids[0]-1];
-               }
-               ids[0] = MDB_NOID;
+               /* no room */
+               --ids[0];
+               return -2;
        
        } else {
                /* insert id */

diff --git a/libraries/liblmdb/midl.h b/libraries/liblmdb/midl.h
index 792e6ab938b828a6fd9c6d292c1213c2636ffe7f..019d92849edeb1ad96da474a59798c62ad372300 100644 (file)
--- a/libraries/liblmdb/midl.h
+++ b/libraries/liblmdb/midl.h
@@ -52,64 +52,27 @@ typedef size_t MDB_ID;
         */
 typedef MDB_ID *MDB_IDL;
 
-#define        MDB_NOID        (~(MDB_ID)0)
-
 /* IDL sizes - likely should be even bigger
  *   limiting factors: sizeof(ID), thread stack size
  */
 #define        MDB_IDL_LOGN    16      /* DB_SIZE is 2^16, UM_SIZE is 2^17 */
 #define MDB_IDL_DB_SIZE                (1<<MDB_IDL_LOGN)
 #define MDB_IDL_UM_SIZE                (1<<(MDB_IDL_LOGN+1))
-#define MDB_IDL_UM_SIZEOF      (MDB_IDL_UM_SIZE * sizeof(MDB_ID))
 
 #define MDB_IDL_DB_MAX         (MDB_IDL_DB_SIZE-1)
-
 #define MDB_IDL_UM_MAX         (MDB_IDL_UM_SIZE-1)
 
-#define MDB_IDL_IS_RANGE(ids)  ((ids)[0] == MDB_NOID)
-#define MDB_IDL_RANGE_SIZE             (3)
-#define MDB_IDL_RANGE_SIZEOF   (MDB_IDL_RANGE_SIZE * sizeof(MDB_ID))
-#define MDB_IDL_SIZEOF(ids)            ((MDB_IDL_IS_RANGE(ids) \
-       ? MDB_IDL_RANGE_SIZE : ((ids)[0]+1)) * sizeof(MDB_ID))
-
-#define MDB_IDL_RANGE_FIRST(ids)       ((ids)[1])
-#define MDB_IDL_RANGE_LAST(ids)                ((ids)[2])
-
-#define MDB_IDL_RANGE( ids, f, l ) \
-       do { \
-               (ids)[0] = MDB_NOID; \
-               (ids)[1] = (f);  \
-               (ids)[2] = (l);  \
-       } while(0)
-
-#define MDB_IDL_ZERO(ids) \
-       do { \
-               (ids)[0] = 0; \
-               (ids)[1] = 0; \
-               (ids)[2] = 0; \
-       } while(0)
-
+#define MDB_IDL_SIZEOF(ids)            (((ids)[0]+1) * sizeof(MDB_ID))
 #define MDB_IDL_IS_ZERO(ids) ( (ids)[0] == 0 )
-#define MDB_IDL_IS_ALL( range, ids ) ( (ids)[0] == MDB_NOID \
-       && (ids)[1] <= (range)[1] && (range)[2] <= (ids)[2] )
-
 #define MDB_IDL_CPY( dst, src ) (memcpy( dst, src, MDB_IDL_SIZEOF( src ) ))
-
-#define MDB_IDL_ID( bdb, ids, id ) MDB_IDL_RANGE( ids, id, ((bdb)->bi_lastid) )
-#define MDB_IDL_ALL( bdb, ids ) MDB_IDL_RANGE( ids, 1, ((bdb)->bi_lastid) )
-
 #define MDB_IDL_FIRST( ids )   ( (ids)[1] )
-#define MDB_IDL_LAST( ids )            ( MDB_IDL_IS_RANGE(ids) \
-       ? (ids)[2] : (ids)[(ids)[0]] )
-
-#define MDB_IDL_N( ids )               ( MDB_IDL_IS_RANGE(ids) \
-       ? ((ids)[2]-(ids)[1])+1 : (ids)[0] )
+#define MDB_IDL_LAST( ids )            ( (ids)[(ids)[0]] )
 
 #if 0  /* superseded by append/sort */
        /** Insert an ID into an IDL.
         * @param[in,out] ids   The IDL to insert into.
         * @param[in] id        The ID to insert.
-        * @return      0 on success, -1 if the ID was already present in the IDL.
+        * @return      0 on success, -1 if ID was already present, -2 on error.
         */
 int mdb_midl_insert( MDB_IDL ids, MDB_ID id );
 #endif