Commit cb7c9552 authored by Hallvard Furuseth's avatar Hallvard Furuseth Committed by Howard Chu
Browse files

Simplify: Replace IDL*_CMP() with CMP()

parent 3029bb69
...@@ -21,11 +21,7 @@ ...@@ -21,11 +21,7 @@
typedef unsigned long pgno_t; typedef unsigned long pgno_t;
/* Sort the IDLs from highest to lowest */ #define CMP(x,y) ( (x) > (y) ? -1 : (x) < (y) )
#define IDL_CMP(x,y) ( (x) > (y) ? -1 : (x) < (y) )
/* Sort the IDL2s from lowest to highest */
#define IDL2_CMP(x,y) ( (x) < (y) ? -1 : (x) > (y) )
unsigned mdb_midl_search( ID *ids, ID id ) unsigned mdb_midl_search( ID *ids, ID id )
{ {
...@@ -42,7 +38,7 @@ unsigned mdb_midl_search( ID *ids, ID id ) ...@@ -42,7 +38,7 @@ unsigned mdb_midl_search( ID *ids, ID id )
while( 0 < n ) { while( 0 < n ) {
int pivot = n >> 1; int pivot = n >> 1;
cursor = base + pivot; cursor = base + pivot;
val = IDL_CMP( id, ids[cursor + 1] ); val = CMP( id, ids[cursor + 1] );
if( val < 0 ) { if( val < 0 ) {
n = pivot; n = pivot;
...@@ -127,7 +123,7 @@ unsigned mdb_midl2_search( MIDL2 *ids, MIDL2 *id ) ...@@ -127,7 +123,7 @@ unsigned mdb_midl2_search( MIDL2 *ids, MIDL2 *id )
while( 0 < n ) { while( 0 < n ) {
int pivot = n >> 1; int pivot = n >> 1;
cursor = base + pivot; cursor = base + pivot;
val = IDL2_CMP( id->mid, ids[cursor + 1].mid ); val = CMP( ids[cursor + 1].mid, id->mid );
if( val < 0 ) { if( val < 0 ) {
n = pivot; n = pivot;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment