isync

commit a365e20660cfd90fe0823a72cb3805c9a5ba41c0
parent 1f7b81fb8bf211c98edda8aa94089a7e0e016589
Author: Oswald Buddenhagen <ossi@users.sf.net>
Date:   Sat, 23 Feb 2008 09:01:51 +0000

put pointers to bdb open() into parentheses, so they won't be
macro-expanded as libc open.
patch by fedora
-REF: <1197916586.13945.120.camel@localhost.localdomain>

Diffstat:
M
src/compat/convert.c
 | 
2
+-
M
src/drv_maildir.c
 | 
4
++--
M
src/mdconvert.c
 | 
2
+-

3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/compat/convert.c b/src/compat/convert.c
@@ -145,7 +145,7 @@ convert( config_t *box )
 			fputs( "dbcreate failed\n", stderr );
 			goto err2;
 		}
-		if (db->open( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
+		if ((db->open)( db, 0, iumname, 0, DB_HASH, 0, 0 )) {
 			fputs( "cannot open db\n", stderr );
 			db->close( db, 0 );
 			goto err2;
diff --git a/src/drv_maildir.c b/src/drv_maildir.c
@@ -521,7 +521,7 @@ maildir_scan( maildir_store_t *ctx, msglist_t *msglist )
 				fputs( "Maildir error: db_create() failed\n", stderr );
 				return DRV_BOX_BAD;
 			}
-			if (tdb->open( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
+			if ((tdb->open)( tdb, 0, 0, 0, DB_HASH, DB_CREATE, 0 )) {
 				fputs( "Maildir error: tdb->open() failed\n", stderr );
 				tdb->close( tdb, 0 );
 				return DRV_BOX_BAD;
@@ -825,7 +825,7 @@ maildir_select( store_t *gctx, int minuid, int maxuid, int *excs, int nexcs,
 			fputs( "Maildir error: db_create() failed\n", stderr );
 			goto bork;
 		}
-		if ((ret = ctx->db->open( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+		if ((ret = (ctx->db->open)( ctx->db, 0, uvpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 			ctx->db->err( ctx->db, ret, "Maildir error: db->open(%s)", uvpath );
 		  dbork:
 			ctx->db->close( ctx->db, 0 );
diff --git a/src/mdconvert.c b/src/mdconvert.c
@@ -96,7 +96,7 @@ convert( const char *box, int altmap )
 		fputs( "Error: db_create() failed\n", stderr );
 		goto tbork;
 	}
-	if ((ret = db->open( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
+	if ((ret = (db->open)( db, 0, dbpath, 0, DB_HASH, DB_CREATE, 0 ))) {
 		db->err( db, ret, "Error: db->open(%s)", dbpath );
 	  dbork:
 		db->close( db, 0 );