#include "back-bdb.h"
#include "idl.h"
-#define IDL_MAX(x,y) ( x > y ? x : y )
-#define IDL_MIN(x,y) ( x < y ? x : y )
-
-#define IDL_CMP(x,y) ( x < y ? -1 : ( x > y ? 1 : 0 ) )
+#define IDL_MAX(x,y) ( (x) > (y) ? (x) : (y) )
+#define IDL_MIN(x,y) ( (x) < (y) ? (x) : (y) )
+#define IDL_CMP(x,y) ( (x) < (y) ? -1 : (x) > (y) )
#define IDL_LRU_DELETE( bdb, e ) do { \
if ( (e) == (bdb)->bi_idl_lru_head ) { \
* if not found, returns first postion greater than id
*/
unsigned base = 0;
- unsigned cursor = 0;
+ unsigned cursor = 1;
int val = 0;
unsigned n = ids[0];
#endif
while( 0 < n ) {
- int pivot = n >> 1;
- cursor = base + pivot;
- val = IDL_CMP( id, ids[cursor + 1] );
+ unsigned pivot = n >> 1;
+ cursor = base + pivot + 1;
+ val = IDL_CMP( id, ids[cursor] );
if( val < 0 ) {
n = pivot;
} else if ( val > 0 ) {
- base = cursor + 1;
+ base = cursor;
n -= pivot + 1;
} else {
- return cursor + 1;
+ return cursor;
}
}
if( val > 0 ) {
- return cursor + 2;
- } else {
- return cursor + 1;
+ ++cursor;
}
+ return cursor;
#else
/* (reverse) linear search */
if (BDB_IDL_IS_RANGE( ids )) {
/* if already in range, treat as a dup */
- if (id >= BDB_IDL_FIRST(ids) && id <= BDB_IDL_LAST(ids))
+ if (id >= BDB_IDL_RANGE_FIRST(ids) && id <= BDB_IDL_RANGE_LAST(ids))
return -1;
- if (id < BDB_IDL_FIRST(ids))
+ if (id < BDB_IDL_RANGE_FIRST(ids))
ids[1] = id;
- else if (id > BDB_IDL_LAST(ids))
+ else if (id > BDB_IDL_RANGE_LAST(ids))
ids[2] = id;
return 0;
}
return 0;
}
-static int bdb_idl_delete( ID *ids, ID id )
+int bdb_idl_delete( ID *ids, ID id )
{
unsigned x;
* turn it into a range.
*/
if ( BDB_IDL_IS_RANGE( b )
- && BDB_IDL_FIRST( b ) <= BDB_IDL_FIRST( a )
- && BDB_IDL_LAST( b ) >= BDB_IDL_LAST( a ) ) {
+ && BDB_IDL_RANGE_FIRST( b ) <= BDB_IDL_RANGE_FIRST( a )
+ && BDB_IDL_RANGE_LAST( b ) >= BDB_IDL_RANGE_LAST( a ) ) {
if (idmax - idmin + 1 == a[0])
{
a[0] = NOID;
{
if (BDB_IDL_IS_RANGE( ids )) {
/* if already in range, treat as a dup */
- if (id >= BDB_IDL_FIRST(ids) && id <= BDB_IDL_LAST(ids))
+ if (id >= BDB_IDL_RANGE_FIRST(ids) && id <= BDB_IDL_RANGE_LAST(ids))
return -1;
- if (id < BDB_IDL_FIRST(ids))
+ if (id < BDB_IDL_RANGE_FIRST(ids))
ids[1] = id;
- else if (id > BDB_IDL_LAST(ids))
+ else if (id > BDB_IDL_RANGE_LAST(ids))
ids[2] = id;
return 0;
}