From cb7c95522055c4928a78694605ca1b5cc679b8fc Mon Sep 17 00:00:00 2001 From: Hallvard B Furuseth Date: Fri, 19 Aug 2011 17:27:06 +0200 Subject: [PATCH] Simplify: Replace IDL*_CMP() with CMP() --- libraries/libmdb/midl.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libraries/libmdb/midl.c b/libraries/libmdb/midl.c index 64eefe8..4b90a68 100644 --- a/libraries/libmdb/midl.c +++ b/libraries/libmdb/midl.c @@ -21,11 +21,7 @@ typedef unsigned long pgno_t; -/* Sort the IDLs from highest to lowest */ -#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) ) +#define CMP(x,y) ( (x) > (y) ? -1 : (x) < (y) ) unsigned mdb_midl_search( ID *ids, ID id ) { @@ -42,7 +38,7 @@ unsigned mdb_midl_search( ID *ids, ID id ) while( 0 < n ) { int pivot = n >> 1; cursor = base + pivot; - val = IDL_CMP( id, ids[cursor + 1] ); + val = CMP( id, ids[cursor + 1] ); if( val < 0 ) { n = pivot; @@ -127,7 +123,7 @@ unsigned mdb_midl2_search( MIDL2 *ids, MIDL2 *id ) while( 0 < n ) { int pivot = n >> 1; cursor = base + pivot; - val = IDL2_CMP( id->mid, ids[cursor + 1].mid ); + val = CMP( ids[cursor + 1].mid, id->mid ); if( val < 0 ) { n = pivot;