Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
HAMANO Tsukasa
OpenLDAP
Commits
3029bb69
Commit
3029bb69
authored
Aug 19, 2011
by
Hallvard Furuseth
Committed by
Howard Chu
Sep 01, 2011
Browse files
Macro cleanup: Parenthesize, simplify, remove a ;
parent
a1b4144b
Changes
4
Hide whitespace changes
Inline
Side-by-side
libraries/libmdb/mdb.c
View file @
3029bb69
...
...
@@ -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
...
...
libraries/libmdb/mdb.h
View file @
3029bb69
...
...
@@ -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"
...
...
libraries/libmdb/midl.c
View file @
3029bb69
...
...
@@ -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
)
{
...
...
libraries/libmdb/midl.h
View file @
3029bb69
...
...
@@ -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
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment