Macro cleanup: Parenthesize, simplify, remove a ;

diff --git a/libraries/libmdb/mdb.c b/libraries/libmdb/mdb.c
index 30037849858b05ad2b383f2ddaf2e8192228e7d7..3de7e1d71bb06fb365697880fb76825a08f6761b 100644 (file)
--- a/libraries/libmdb/mdb.c
+++ b/libraries/libmdb/mdb.c
@@ -178,7 +178,7 @@ typedef struct MDB_page {           /* represents a page of storage */
 #define IS_BRANCH(p)    F_ISSET((p)->mp_flags, P_BRANCH)
 #define IS_OVERFLOW(p)  F_ISSET((p)->mp_flags, P_OVERFLOW)
 
-#define OVPAGES(size, psize)   (PAGEHDRSZ + size + psize - 1) / psize;
+#define OVPAGES(size, psize)   ((PAGEHDRSZ-1 + (size)) / (psize) + 1)
 
 typedef struct MDB_db {
        uint32_t        md_pad;
@@ -252,7 +252,7 @@ struct MDB_cursor {
        struct MDB_xcursor      *mc_xcursor;
 };
 
-#define METADATA(p)     ((void *)((char *)p + PAGEHDRSZ))
+#define METADATA(p)     ((void *)((char *)(p) + PAGEHDRSZ))
 
 typedef struct MDB_node {
 #define mn_pgno                 mn_p.np_pgno

diff --git a/libraries/libmdb/mdb.h b/libraries/libmdb/mdb.h
index 372dfc136437f533251624e8e23ac2fe11ec95b7..9d6ebf429e5cee2e59786e8d8a0bf76d1e4bc6f2 100644 (file)
--- a/libraries/libmdb/mdb.h
+++ b/libraries/libmdb/mdb.h
@@ -35,7 +35,7 @@
 #define MDB_VERSION_MAJOR      0
 #define MDB_VERSION_MINOR      8
 #define MDB_VERSION_PATCH      0
-#define MDB_VERINT(a,b,c)      ((a << 24) | (b << 16) | c)
+#define MDB_VERINT(a,b,c)      (((a) << 24) | ((b) << 16) | (c))
 #define MDB_VERSION_FULL       \
        MDB_VERINT(MDB_VERSION_MAJOR,MDB_VERSION_MINOR,MDB_VERSION_PATCH)
 #define MDB_VERSION_DATE       "August 11, 2011"

diff --git a/libraries/libmdb/midl.c b/libraries/libmdb/midl.c
index 136798f75f2f2204349a371e63c4218229b526d1..64eefe82c868d18ba7f0f5958a6a8af7fd4c4526 100644 (file)
--- a/libraries/libmdb/midl.c
+++ b/libraries/libmdb/midl.c
@@ -22,10 +22,10 @@
 typedef unsigned long pgno_t;
 
 /* Sort the IDLs from highest to lowest */
-#define IDL_CMP(x,y)    ( x > y ? -1 : ( x < y ? 1 : 0 ) )
+#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 ? 1 : 0 ) )
+#define IDL2_CMP(x,y)   ( (x) < (y) ? -1 : (x) > (y) )
 
 unsigned mdb_midl_search( ID *ids, ID id )
 {

diff --git a/libraries/libmdb/midl.h b/libraries/libmdb/midl.h
index 31a4b67bd2ce4907f33a3b8451e4f1b061f8c304..0836760ab53faaa762ae804abae5d9e5924a82ca 100644 (file)
--- a/libraries/libmdb/midl.h
+++ b/libraries/libmdb/midl.h
@@ -18,7 +18,7 @@
 #define _MDB_MIDL_H_
 
 #define        ID      unsigned long
-#define        NOID    ((ID)~0)
+#define        NOID    (~(ID)0)
 
 /* IDL sizes - likely should be even bigger
  *   limiting factors: sizeof(ID), thread stack size
@@ -64,12 +64,12 @@
 #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_FIRST( ids )   ( (ids)[1] )
 #define MDB_IDL_LAST( ids )            ( MDB_IDL_IS_RANGE(ids) \
-       ? ids[2] : ids[ids[0]] )
+       ? (ids)[2] : (ids)[(ids)[0]] )
 
 #define MDB_IDL_N( ids )               ( MDB_IDL_IS_RANGE(ids) \
-       ? (ids[2]-ids[1])+1 : ids[0] )
+       ? ((ids)[2]-(ids)[1])+1 : (ids)[0] )
 
 int mdb_midl_insert( ID *ids, ID id );