RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm db Date: 19-Aug-2007 01:40:36
Branch: HEAD Handle: 2007081900402907
Modified files:
db/db185 db185.c
db/db_archive db_archive.c
db/db_checkpoint db_checkpoint.c
db/db_codegen code_capi.c
db/db_deadlock db_deadlock.c
db/db_dump db_dump.c
db/db_hotbackup db_hotbackup.c
db/db_load db_load.c
db/db_printlog db_printlog.c
db/db_recover db_recover.c
db/db_stat db_stat.c
db/db_upgrade db_upgrade.c
db/db_verify db_verify.c
db/dbm dbm.c
db/hsearch hsearch.c
db/libdb_java db_java_wrap.c
db/rpc_server/c db_server_proc.c db_server_util.c
db/rpc_server/cxx db_server_cxxproc.cpp db_server_cxxutil.cpp
db/tcl tcl_db_pkg.c tcl_mp.c
db/xa xa.c xa_db.c
rpm CHANGES
rpm/rpmdb db3.c tjfn.c
Log:
- prepare for open as a macro in bleeding edge glibc-2.6.90+.
Summary:
Revision Changes Path
1.8 +1 -1 db/db185/db185.c
1.8 +2 -2 db/db_archive/db_archive.c
1.9 +2 -2 db/db_checkpoint/db_checkpoint.c
1.2 +2 -2 db/db_codegen/code_capi.c
1.8 +1 -1 db/db_deadlock/db_deadlock.c
1.8 +4 -4 db/db_dump/db_dump.c
1.6 +3 -3 db/db_hotbackup/db_hotbackup.c
1.10 +3 -3 db/db_load/db_load.c
1.8 +5 -5 db/db_printlog/db_printlog.c
1.8 +1 -1 db/db_recover/db_recover.c
1.8 +4 -4 db/db_stat/db_stat.c
1.8 +2 -2 db/db_upgrade/db_upgrade.c
1.8 +3 -3 db/db_verify/db_verify.c
1.8 +1 -1 db/dbm/dbm.c
1.8 +1 -1 db/hsearch/hsearch.c
1.9 +3 -3 db/libdb_java/db_java_wrap.c
1.8 +2 -2 db/rpc_server/c/db_server_proc.c
1.8 +1 -1 db/rpc_server/c/db_server_util.c
1.8 +2 -2 db/rpc_server/cxx/db_server_cxxproc.cpp
1.8 +1 -1 db/rpc_server/cxx/db_server_cxxutil.cpp
1.10 +3 -3 db/tcl/tcl_db_pkg.c
1.8 +1 -1 db/tcl/tcl_mp.c
1.10 +1 -1 db/xa/xa.c
1.8 +1 -1 db/xa/xa_db.c
1.1587 +1 -0 rpm/CHANGES
1.71 +5 -5 rpm/rpmdb/db3.c
1.6 +3 -3 rpm/rpmdb/tjfn.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: db/db185/db185.c
============================================================================
$ cvs diff -u -r1.7 -r1.8 db185.c
--- db/db185/db185.c 29 Jul 2007 13:10:45 -0000 1.7
+++ db/db185/db185.c 18 Aug 2007 23:40:30 -0000 1.8
@@ -227,7 +227,7 @@
dbp->api_internal = db185p;
/* Open the database. */
- if ((ret = dbp->open(dbp, NULL,
+ if ((ret = (dbp->open)(dbp, NULL,
file, NULL, type, __db_oflags(oflags), mode)) != 0)
goto err;
@@ .
patch -p0 <<'@@ .'
Index: db/db_archive/db_archive.c
============================================================================
$ cvs diff -u -r1.7 -r1.8 db_archive.c
--- db/db_archive/db_archive.c 29 Jul 2007 13:10:46 -0000 1.7
+++ db/db_archive/db_archive.c 18 Aug 2007 23:40:30 -0000 1.8
@@ -119,9 +119,9 @@
* If attaching to a pre-existing environment fails, create a
* private one and try again.
*/
- if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+ if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
(ret == DB_VERSION_MISMATCH ||
- (ret = dbenv->open(dbenv, home, DB_CREATE |
+ (ret = (dbenv->open)(dbenv, home, DB_CREATE |
DB_INIT_LOG | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) {
dbenv->err(dbenv, ret, "DB_ENV->open");
goto shutdown;
@@ .
patch -p0 <<'@@ .'
Index: db/db_checkpoint/db_checkpoint.c
============================================================================
$ cvs diff -u -r1.8 -r1.9 db_checkpoint.c
--- db/db_checkpoint/db_checkpoint.c 29 Jul 2007 13:10:46 -0000 1.8
+++ db/db_checkpoint/db_checkpoint.c 18 Aug 2007 23:40:31 -0000 1.9
@@ -141,9 +141,9 @@
* If attaching to a pre-existing environment fails, create a
* private one and try again.
*/
- if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+ if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
(!once || ret == DB_VERSION_MISMATCH ||
- (ret = dbenv->open(dbenv, home,
+ (ret = (dbenv->open)(dbenv, home,
DB_CREATE | DB_INIT_TXN | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) {
dbenv->err(dbenv, ret, "DB_ENV->open");
goto shutdown;
@@ .
patch -p0 <<'@@ .'
Index: db/db_codegen/code_capi.c
============================================================================
$ cvs diff -u -r1.1.1.1 -r1.2 code_capi.c
--- db/db_codegen/code_capi.c 29 Jul 2007 13:05:39 -0000 1.1.1.1
+++ db/db_codegen/code_capi.c 18 Aug 2007 23:40:31 -0000 1.2
@@ -368,7 +368,7 @@
\tif (ep->transaction)\n\
\t open_flags |= DB_INIT_LOCK |\n\
\t DB_INIT_LOG | DB_INIT_TXN | DB_RECOVER;\n\
-\tif ((ret = dbenv->open(dbenv, ep->home, open_flags, 0)) != 0) {\n\
+\tif ((ret = (dbenv->open)(dbenv, ep->home, open_flags, 0)) != 0) {\n\
\t dbenv->err(dbenv, ret, \"DB_ENV->open: %%s\", ep->home);\n\
\t goto err;\n\
\t}\n\
@@ -487,7 +487,7 @@
fprintf(of, "\
\n\
-\tif ((ret = dbp->open(dbp, NULL, dp->name, NULL, dp->type,\n\
+\tif ((ret = (dbp->open)(dbp, NULL, dp->name, NULL, dp->type,\n\
\t (dp->transaction ? DB_AUTO_COMMIT : 0) |\n\
\t DB_CREATE | DB_THREAD, 0)) != 0) {\n\
\t\tdbp->err(dbp, ret, \"DB->open: %%s\", dp->name);\n\
@@ .
patch -p0 <<'@@ .'
Index: db/db_deadlock/db_deadlock.c
============================================================================
$ cvs diff -u -r1.7 -r1.8 db_deadlock.c
--- db/db_deadlock/db_deadlock.c 29 Jul 2007 13:10:46 -0000 1.7
+++ db/db_deadlock/db_deadlock.c 18 Aug 2007 23:40:31 -0000 1.8
@@ -157,7 +157,7 @@
}
/* An environment is required. */
- if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0) {
+ if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0) {
dbenv->err(dbenv, ret, "open");
goto shutdown;
}
@@ .
patch -p0 <<'@@ .'
Index: db/db_dump/db_dump.c
============================================================================
$ cvs diff -u -r1.7 -r1.8 db_dump.c
--- db/db_dump/db_dump.c 29 Jul 2007 13:10:46 -0000 1.7
+++ db/db_dump/db_dump.c 18 Aug 2007 23:40:31 -0000 1.8
@@ -199,7 +199,7 @@
goto done;
}
- if ((ret = dbp->open(dbp, NULL,
+ if ((ret = (dbp->open)(dbp, NULL,
argv[0], subname, DB_UNKNOWN, DB_RDONLY, 0)) != 0) {
dbp->err(dbp, ret, "open: %s", argv[0]);
goto err;
@@ -296,7 +296,7 @@
* before we create our own.
*/
*is_privatep = 0;
- if ((ret = dbenv->open(dbenv, home,
+ if ((ret = (dbenv->open)(dbenv, home,
DB_USE_ENVIRON | (is_salvage ? DB_INIT_MPOOL : 0), 0)) == 0)
return (0);
if (ret == DB_VERSION_MISMATCH)
@@ -314,7 +314,7 @@
*/
*is_privatep = 1;
if ((ret = dbenv->set_cachesize(dbenv, 0, cache, 1)) == 0 &&
- (ret = dbenv->open(dbenv, home,
+ (ret = (dbenv->open)(dbenv, home,
DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0)) == 0)
return (0);
@@ -367,7 +367,7 @@
free(subdb);
return (1);
}
- if ((ret = dbp->open(dbp, NULL,
+ if ((ret = (dbp->open)(dbp, NULL,
parent_name, subdb, DB_UNKNOWN, DB_RDONLY, 0)) != 0)
dbp->err(dbp, ret,
"DB->open: %s:%s", parent_name, subdb);
@@ .
patch -p0 <<'@@ .'
Index: db/db_hotbackup/db_hotbackup.c
============================================================================
$ cvs diff -u -r1.5 -r1.6 db_hotbackup.c
--- db/db_hotbackup/db_hotbackup.c 29 Jul 2007 13:10:47 -0000 1.5
+++ db/db_hotbackup/db_hotbackup.c 18 Aug 2007 23:40:32 -0000 1.6
@@ -418,9 +418,9 @@
* We try to attach to a pre-existing environment; if that
* fails, we create a private environment and try again.
*/
- if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+ if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
(ret == DB_VERSION_MISMATCH ||
- (ret = dbenv->open(dbenv, home, DB_CREATE |
+ (ret = (dbenv->open)(dbenv, home, DB_CREATE |
DB_INIT_LOG | DB_INIT_TXN | DB_PRIVATE | DB_USE_ENVIRON,
0)) != 0)) {
dbenv->err(dbenv, ret, "DB_ENV->open: %s", home);
@@ -445,7 +445,7 @@
ret, "DB_ENV->set_cachesize: %s", home);
return (1);
}
- if ((ret = dbenv->open(dbenv, home, DB_CREATE |
+ if ((ret = (dbenv->open)(dbenv, home, DB_CREATE |
DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN | DB_PRIVATE |
DB_RECOVER_FATAL | DB_USE_ENVIRON, 0)) != 0) {
dbenv->err(dbenv, ret, "DB_ENV->open: %s", home);
@@ .
patch -p0 <<'@@ .'
Index: db/db_load/db_load.c
============================================================================
$ cvs diff -u -r1.9 -r1.10 db_load.c
--- db/db_load/db_load.c 29 Jul 2007 13:10:47 -0000 1.9
+++ db/db_load/db_load.c 18 Aug 2007 23:40:32 -0000 1.10
@@ -394,7 +394,7 @@
#endif
/* Open the DB file. */
- if ((ret = dbp->open(dbp, NULL, name, subdb, dbtype,
+ if ((ret = (dbp->open)(dbp, NULL, name, subdb, dbtype,
DB_CREATE | (TXN_ON(dbenv) ? DB_AUTO_COMMIT : 0),
__db_omode("rw-rw-rw-"))) != 0) {
dbp->err(dbp, ret, "DB->open: %s", name);
@@ -608,7 +608,7 @@
/* We may be loading into a live environment. Try and join. */
flags = DB_USE_ENVIRON |
DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN;
- if ((ret = dbenv->open(dbenv, home, flags, 0)) == 0)
+ if ((ret = (dbenv->open)(dbenv, home, flags, 0)) == 0)
return (0);
if (ret == DB_VERSION_MISMATCH)
goto err;
@@ -632,7 +632,7 @@
dbenv->err(dbenv, ret, "set_cachesize");
return (1);
}
- if ((ret = dbenv->open(dbenv, home, flags, 0)) == 0)
+ if ((ret = (dbenv->open)(dbenv, home, flags, 0)) == 0)
return (0);
/* An environment is required. */
@@ .
patch -p0 <<'@@ .'
Index: db/db_printlog/db_printlog.c
============================================================================
$ cvs diff -u -r1.7 -r1.8 db_printlog.c
--- db/db_printlog/db_printlog.c 29 Jul 2007 13:10:47 -0000 1.7
+++ db/db_printlog/db_printlog.c 18 Aug 2007 23:40:32 -0000 1.8
@@ -173,18 +173,18 @@
* with logging, because we don't want to log the opens.
*/
if (repflag) {
- if ((ret = dbenv->open(dbenv, home,
+ if ((ret = (dbenv->open)(dbenv, home,
DB_INIT_MPOOL | DB_USE_ENVIRON, 0)) != 0 &&
(ret == DB_VERSION_MISMATCH ||
- (ret = dbenv->open(dbenv, home,
+ (ret = (dbenv->open)(dbenv, home,
DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0))
!= 0)) {
dbenv->err(dbenv, ret, "DB_ENV->open");
goto shutdown;
}
- } else if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+ } else if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
(ret == DB_VERSION_MISMATCH ||
- (ret = dbenv->open(dbenv, home,
+ (ret = (dbenv->open)(dbenv, home,
DB_CREATE | DB_INIT_LOG | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) {
dbenv->err(dbenv, ret, "DB_ENV->open");
goto shutdown;
@@ -544,7 +544,7 @@
dbp = *dbpp;
if ((ret =
- dbp->open(dbp, NULL, REPDBNAME, NULL, DB_BTREE, 0, 0)) != 0) {
+ (dbp->open)(dbp, NULL, REPDBNAME, NULL, DB_BTREE, 0, 0)) != 0) {
dbenv->err(dbenv, ret, "DB->open");
goto err;
}
@@ .
patch -p0 <<'@@ .'
Index: db/db_recover/db_recover.c
============================================================================
$ cvs diff -u -r1.7 -r1.8 db_recover.c
--- db/db_recover/db_recover.c 29 Jul 2007 13:10:48 -0000 1.7
+++ db/db_recover/db_recover.c 18 Aug 2007 23:40:32 -0000 1.8
@@ -138,7 +138,7 @@
DB_INIT_MPOOL | DB_INIT_TXN | DB_USE_ENVIRON);
LF_SET(fatal_recover ? DB_RECOVER_FATAL : DB_RECOVER);
LF_SET(retain_env ? DB_INIT_LOCK : DB_PRIVATE);
- if ((ret = dbenv->open(dbenv, home, flags, 0)) != 0) {
+ if ((ret = (dbenv->open)(dbenv, home, flags, 0)) != 0) {
dbenv->err(dbenv, ret, "DB_ENV->open");
goto shutdown;
}
@@ .
patch -p0 <<'@@ .'
Index: db/db_stat/db_stat.c
============================================================================
$ cvs diff -u -r1.7 -r1.8 db_stat.c
--- db/db_stat/db_stat.c 29 Jul 2007 13:10:48 -0000 1.7
+++ db/db_stat/db_stat.c 18 Aug 2007 23:40:33 -0000 1.8
@@ -282,9 +282,9 @@
* hash databases for which we don't know the hash function).
*/
dbenv->set_errfile(dbenv, NULL);
- ret = dbp->open(dbp, NULL, db, subdb, DB_UNKNOWN, 0, 0);
+ ret = (dbp->open)(dbp, NULL, db, subdb, DB_UNKNOWN, 0, 0);
dbenv->set_errfile(dbenv, stderr);
- if (ret != 0 && (ret = dbp->open(
+ if (ret != 0 && (ret = (dbp->open)(
dbp, NULL, db, subdb, DB_UNKNOWN, DB_RDONLY, 0)) != 0) {
dbenv->err(dbenv, ret, "DB->open: %s", db);
goto err;
@@ -392,7 +392,7 @@
* error, I think.
*/
*is_private = 0;
- if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) == 0)
+ if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) == 0)
return (0);
if (ret == DB_VERSION_MISMATCH)
goto err;
@@ -422,7 +422,7 @@
oflags |= DB_INIT_MPOOL;
if (ttype == T_LOG)
oflags |= DB_INIT_LOG;
- if ((ret = dbenv->open(dbenv, home, oflags, 0)) == 0)
+ if ((ret = (dbenv->open)(dbenv, home, oflags, 0)) == 0)
return (0);
/* An environment is required. */
@@ .
patch -p0 <<'@@ .'
Index: db/db_upgrade/db_upgrade.c
============================================================================
$ cvs diff -u -r1.7 -r1.8 db_upgrade.c
--- db/db_upgrade/db_upgrade.c 29 Jul 2007 13:10:48 -0000 1.7
+++ db/db_upgrade/db_upgrade.c 18 Aug 2007 23:40:33 -0000 1.8
@@ -119,9 +119,9 @@
* If attaching to a pre-existing environment fails, create a
* private one and try again.
*/
- if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
+ if ((ret = (dbenv->open)(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
(ret == DB_VERSION_MISMATCH ||
- (ret = dbenv->open(dbenv, home,
+ (ret = (dbenv->open)(dbenv, home,
DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON,
0)) != 0)) {
dbenv->err(dbenv, ret, "DB_ENV->open");
@@ .
patch -p0 <<'@@ .'
Index: db/db_verify/db_verify.c
============================================================================
$ cvs diff -u -r1.7 -r1.8 db_verify.c
--- db/db_verify/db_verify.c 29 Jul 2007 13:10:49 -0000 1.7
+++ db/db_verify/db_verify.c 18 Aug 2007 23:40:33 -0000 1.8
@@ -129,7 +129,7 @@
*/
private = 0;
if ((ret =
- dbenv->open(dbenv, home, DB_INIT_MPOOL | DB_USE_ENVIRON, 0)) != 0) {
+ (dbenv->open)(dbenv, home, DB_INIT_MPOOL | DB_USE_ENVIRON, 0)) != 0) {
if (ret != DB_VERSION_MISMATCH) {
if ((ret =
dbenv->set_cachesize(dbenv, 0, cache, 1)) != 0) {
@@ -137,7 +137,7 @@
goto shutdown;
}
private = 1;
- ret = dbenv->open(dbenv, home, DB_CREATE |
+ ret = (dbenv->open)(dbenv, home, DB_CREATE |
DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0);
}
if (ret != 0) {
@@ -186,7 +186,7 @@
goto shutdown;
}
- ret = dbp1->open(dbp1,
+ ret = (dbp1->open)(dbp1,
NULL, argv[0], NULL, DB_UNKNOWN, DB_RDONLY, 0);
/*
@@ .
patch -p0 <<'@@ .'
Index: db/dbm/dbm.c
============================================================================
$ cvs diff -u -r1.7 -r1.8 dbm.c
--- db/dbm/dbm.c 29 Jul 2007 13:10:53 -0000 1.7
+++ db/dbm/dbm.c 18 Aug 2007 23:40:33 -0000 1.8
@@ -230,7 +230,7 @@
if ((ret = dbp->set_pagesize(dbp, 4096)) != 0 ||
(ret = dbp->set_h_ffactor(dbp, 40)) != 0 ||
(ret = dbp->set_h_nelem(dbp, 1)) != 0 ||
- (ret = dbp->open(dbp, NULL,
+ (ret = (dbp->open)(dbp, NULL,
path, NULL, DB_HASH, __db_oflags(oflags), mode)) != 0) {
__os_set_errno(ret);
return (NULL);
@@ .
patch -p0 <<'@@ .'
Index: db/hsearch/hsearch.c
============================================================================
$ cvs diff -u -r1.7 -r1.8 hsearch.c
--- db/hsearch/hsearch.c 29 Jul 2007 13:13:05 -0000 1.7
+++ db/hsearch/hsearch.c 18 Aug 2007 23:40:34 -0000 1.8
@@ -75,7 +75,7 @@
if ((ret = dbp->set_pagesize(dbp, 512)) != 0 ||
(ret = dbp->set_h_ffactor(dbp, 16)) != 0 ||
(ret = dbp->set_h_nelem(dbp, (u_int32_t)nel)) != 0 ||
- (ret = dbp->open(dbp, NULL,
+ (ret = (dbp->open)(dbp, NULL,
NULL, NULL, DB_HASH, DB_CREATE, __db_omode(OWNER_RW))) != 0)
__os_set_errno(ret);
@@ .
patch -p0 <<'@@ .'
Index: db/libdb_java/db_java_wrap.c
============================================================================
$ cvs diff -u -r1.8 -r1.9 db_java_wrap.c
--- db/libdb_java/db_java_wrap.c 29 Jul 2007 13:13:19 -0000 1.8
+++ db/libdb_java/db_java_wrap.c 18 Aug 2007 23:40:34 -0000 1.9
@@ -2501,7 +2501,7 @@
return self->key_range(self, txnid, key, key_range, flags);
}
SWIGINTERN db_ret_t Db_open(struct Db *self,DB_TXN *txnid,char const *file,char const *database,DBTYPE type,u_int32_t flags,int mode){
- return self->open(self, txnid, file, database,
+ return (self->open)(self, txnid, file, database,
type, flags, mode);
}
SWIGINTERN int Db_pget(struct Db *self,DB_TXN *txnid,DBT *key,DBT *pkey,DBT *data,u_int32_t flags){
@@ -2723,7 +2723,7 @@
return self->lsn_reset(self, file, flags);
}
SWIGINTERN db_ret_t DbEnv_open(struct DbEnv *self,char const *db_home,u_int32_t flags,int mode){
- return self->open(self, db_home, flags, mode);
+ return (self->open)(self, db_home, flags, mode);
}
SWIGINTERN db_ret_t DbEnv_remove(struct DbEnv *self,char const *db_home,u_int32_t flags){
return self->remove(self, db_home, flags);
@@ -3278,7 +3278,7 @@
return self->initial_value(self, val);
}
SWIGINTERN db_ret_t DbSequence_open(struct DbSequence *self,DB_TXN *txnid,DBT *key,u_int32_t flags){
- return self->open(self, txnid, key, flags);
+ return (self->open)(self, txnid, key, flags);
}
SWIGINTERN db_ret_t DbSequence_remove(struct DbSequence *self,DB_TXN *txnid,u_int32_t flags){
return self->remove(self, txnid, flags);
@@ .
patch -p0 <<'@@ .'
Index: db/rpc_server/c/db_server_proc.c
============================================================================
$ cvs diff -u -r1.7 -r1.8 db_server_proc.c
--- db/rpc_server/c/db_server_proc.c 29 Jul 2007 13:13:40 -0000 1.7
+++ db/rpc_server/c/db_server_proc.c 18 Aug 2007 23:40:34 -0000 1.8
@@ -394,7 +394,7 @@
replyp->envcl_id = new_ctp->ct_id;
ret = __env_close_int(dbenvcl_id, 0, 0);
} else {
- ret = dbenv->open(dbenv, fullhome->home, newflags, mode);
+ ret = (dbenv->open)(dbenv, fullhome->home, newflags, mode);
dbenv_ctp->ct_envdp.home = fullhome;
dbenv_ctp->ct_envdp.envflags = shareflags;
}
@@ -1392,7 +1392,7 @@
ret = __db_close_int(dbpcl_id, 0);
goto out;
}
- ret = dbp->open(dbp, txnp, name, subdb, (DBTYPE)type, flags, mode);
+ ret = (dbp->open)(dbp, txnp, name, subdb, (DBTYPE)type, flags, mode);
if (ret == 0) {
(void)dbp->get_type(dbp, &dbtype);
replyp->type = dbtype;
@@ .
patch -p0 <<'@@ .'
Index: db/rpc_server/c/db_server_util.c
============================================================================
$ cvs diff -u -r1.7 -r1.8 db_server_util.c
--- db/rpc_server/c/db_server_util.c 29 Jul 2007 13:13:40 -0000 1.7
+++ db/rpc_server/c/db_server_util.c 18 Aug 2007 23:40:34 -0000 1.8
@@ -802,7 +802,7 @@
printf("Running recovery on %s\n", hp->home);
flags = DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL |
DB_INIT_TXN | DB_USE_ENVIRON | DB_RECOVER;
- if ((ret = dbenv->open(dbenv, hp->home, flags, 0)) != 0) {
+ if ((ret = (dbenv->open)(dbenv, hp->home, flags, 0)) != 0) {
dbenv->err(dbenv, ret, "DB_ENV->open");
goto error;
}
@@ .
patch -p0 <<'@@ .'
Index: db/rpc_server/cxx/db_server_cxxproc.cpp
============================================================================
$ cvs diff -u -r1.7 -r1.8 db_server_cxxproc.cpp
--- db/rpc_server/cxx/db_server_cxxproc.cpp 29 Jul 2007 13:13:41 -0000 1.7
+++ db/rpc_server/cxx/db_server_cxxproc.cpp 18 Aug 2007 23:40:34 -0000 1.8
@@ -336,7 +336,7 @@
replyp->envcl_id = new_ctp->ct_id;
ret = __env_close_int(dbenvcl_id, 0, 0);
} else {
- ret = dbenv->open(fullhome->home, newflags, mode);
+ ret = (dbenv->open)(fullhome->home, newflags, mode);
dbenv_ctp->ct_envdp.home = fullhome;
dbenv_ctp->ct_envdp.envflags = shareflags;
}
@@ -1187,7 +1187,7 @@
ret = __db_close_int(dbpcl_id, 0);
goto out;
}
- ret = dbp->open(txnp, name, subdb, (DBTYPE)type, flags, mode);
+ ret = (dbp->open)(txnp, name, subdb, (DBTYPE)type, flags, mode);
if (ret == 0) {
(void)dbp->get_type(&dbtype);
replyp->type = dbtype;
@@ .
patch -p0 <<'@@ .'
Index: db/rpc_server/cxx/db_server_cxxutil.cpp
============================================================================
$ cvs diff -u -r1.7 -r1.8 db_server_cxxutil.cpp
--- db/rpc_server/cxx/db_server_cxxutil.cpp 29 Jul 2007 13:13:41 -0000 1.7
+++ db/rpc_server/cxx/db_server_cxxutil.cpp 18 Aug 2007 23:40:34 -0000 1.8
@@ -730,7 +730,7 @@
printf("Running recovery on %s\n", hp->home);
flags = DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL |
DB_INIT_TXN | DB_USE_ENVIRON | DB_RECOVER;
- if ((ret = dbenv->open(hp->home, flags, 0)) != 0) {
+ if ((ret = (dbenv->open)(hp->home, flags, 0)) != 0) {
dbenv->err(ret, "DbEnv->open");
goto error;
}
@@ .
patch -p0 <<'@@ .'
Index: db/tcl/tcl_db_pkg.c
============================================================================
$ cvs diff -u -r1.9 -r1.10 tcl_db_pkg.c
--- db/tcl/tcl_db_pkg.c 29 Jul 2007 13:13:42 -0000 1.9
+++ db/tcl/tcl_db_pkg.c 18 Aug 2007 23:40:35 -0000 1.10
@@ -1377,7 +1377,7 @@
* Now open the environment.
*/
_debug_check();
- ret = (*env)->open(*env, home, open_flags, mode);
+ ret = ((*env)->open)(*env, home, open_flags, mode);
result = _ReturnSetup(interp, ret, DB_RETOK_STD(ret), "env open");
if (rep_flags != 0 && result == TCL_OK) {
@@ -2215,7 +2215,7 @@
_debug_check();
/* Open the database. */
- ret = (*dbp)->open(*dbp, txn, db, subdb, type, open_flags, mode);
+ ret = ((*dbp)->open)(*dbp, txn, db, subdb, type, open_flags, mode);
result = _ReturnSetup(interp, ret, DB_RETOK_STD(ret), "db open");
error:
@@ -2476,7 +2476,7 @@
ret, DB_RETOK_STD(ret), "sequence init")) != TCL_OK)
goto error;
}
- ret = (*seqp)->open(*seqp, txn, &key, oflags);
+ ret = ((*seqp)->open)(*seqp, txn, &key, oflags);
if ((result = _ReturnSetup(interp,
ret, DB_RETOK_STD(ret), "sequence open")) != TCL_OK)
goto error;
@@ .
patch -p0 <<'@@ .'
Index: db/tcl/tcl_mp.c
============================================================================
$ cvs diff -u -r1.7 -r1.8 tcl_mp.c
--- db/tcl/tcl_mp.c 29 Jul 2007 13:13:42 -0000 1.7
+++ db/tcl/tcl_mp.c 18 Aug 2007 23:40:35 -0000 1.8
@@ -275,7 +275,7 @@
* XXX
* Interface doesn't currently support DB_MPOOLFILE configuration.
*/
- if ((ret = mpf->open(mpf, file, flag, mode, (size_t)pgsize)) != 0) {
+ if ((ret = (mpf->open)(mpf, file, flag, mode, (size_t)pgsize)) != 0) {
result = _ReturnSetup(interp, ret, DB_RETOK_STD(ret), "mpool");
_DeleteInfo(ip);
@@ .
patch -p0 <<'@@ .'
Index: db/xa/xa.c
============================================================================
$ cvs diff -u -r1.9 -r1.10 xa.c
--- db/xa/xa.c 29 Jul 2007 13:14:24 -0000 1.9
+++ db/xa/xa.c 18 Aug 2007 23:40:36 -0000 1.10
@@ -206,7 +206,7 @@
/* Open a new environment. */
if (db_env_create(&dbenv, 0) != 0)
return (XAER_RMERR);
- if (dbenv->open(dbenv, xa_info, XA_FLAGS, 0) != 0)
+ if ((dbenv->open)(dbenv, xa_info, XA_FLAGS, 0) != 0)
goto err;
/* Create the mapping. */
@@ .
patch -p0 <<'@@ .'
Index: db/xa/xa_db.c
============================================================================
$ cvs diff -u -r1.7 -r1.8 xa_db.c
--- db/xa/xa_db.c 29 Jul 2007 13:14:24 -0000 1.7
+++ db/xa/xa_db.c 18 Aug 2007 23:40:36 -0000 1.8
@@ -131,7 +131,7 @@
if ((ret =
__xa_set_txn(dbp, &txn, LF_ISSET(DB_AUTO_COMMIT) ? 1 : 0)) != 0)
return (ret);
- if ((ret = xam->open(dbp, txn, name, subdb, type, flags, mode)) != 0)
+ if ((ret = (xam->open)(dbp, txn, name, subdb, type, flags, mode)) != 0)
return (ret);
/* Wrap any DB handle method that takes a TXN ID as an argument. */
@@ .
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1586 -r1.1587 CHANGES
--- rpm/CHANGES 18 Aug 2007 21:32:28 -0000 1.1586
+++ rpm/CHANGES 18 Aug 2007 23:40:29 -0000 1.1587
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - jbj: prepare for open as a macro in bleeding edge glibc-2.6.90+.
- jbj: permit mixed binary/source installation transactions.
- jbj: re-add rpmcache/rpmcmp/rpmdigest tools.
- jbj: more rpmInstall refactoring.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/db3.c
============================================================================
$ cvs diff -u -r1.70 -r1.71 db3.c
--- rpm/rpmdb/db3.c 25 Jul 2007 15:04:32 -0000 1.70
+++ rpm/rpmdb/db3.c 18 Aug 2007 23:40:36 -0000 1.71
@@ -522,9 +522,9 @@
#endif
#if (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR != 0) || (DB_VERSION_MAJOR == 4)
- rc = dbenv->open(dbenv, dbhome, eflags, dbi->dbi_perms);
+ rc = (dbenv->open)(dbenv, dbhome, eflags, dbi->dbi_perms);
#else
- rc = dbenv->open(dbenv, dbhome, NULL, eflags, dbi->dbi_perms);
+ rc = (dbenv->open)(dbenv, dbhome, NULL, eflags, dbi->dbi_perms);
#endif
xx = _debug;
#if defined(DB_VERSION_MISMATCH)
@@ -1028,7 +1028,7 @@
}
eflags = DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON;
- rc = dbenv->open(dbenv, dbhome, eflags, 0);
+ rc = (dbenv->open)(dbenv, dbhome, eflags, 0);
rc = cvtdberr(dbi, "dbenv->open", rc, _debug);
if (rc) goto exit;
@@ -1516,10 +1516,10 @@
#endif
#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
- rc = db->open(db, txnid, dbpath, dbsubfile,
+ rc = (db->open)(db, txnid, dbpath, dbsubfile,
dbi_type, oflags, dbi->dbi_perms);
#else
- rc = db->open(db, dbpath, dbsubfile,
+ rc = (db->open)(db, dbpath, dbsubfile,
dbi_type, oflags, dbi->dbi_perms);
#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/tjfn.c
============================================================================
$ cvs diff -u -r1.5 -r1.6 tjfn.c
--- rpm/rpmdb/tjfn.c 6 Aug 2007 10:44:12 -0000 1.5
+++ rpm/rpmdb/tjfn.c 18 Aug 2007 23:40:36 -0000 1.6
@@ -42,7 +42,7 @@
dbenv->set_errpfx(dbenv, "tjfn");
flags = DB_CREATE | DB_INIT_MPOOL;
- if ((ret = dbenv->open(dbenv, home, flags, 0)) != 0)
+ if ((ret = (dbenv->open)(dbenv, home, flags, 0)) != 0)
goto exit;
exit:
@@ -71,9 +71,9 @@
}
#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
- ret = db->open(db, NULL, dbfn, NULL, DB_BTREE, DB_CREATE, 0664);
+ ret = (db->open)(db, NULL, dbfn, NULL, DB_BTREE, DB_CREATE, 0664);
#else
- ret = db->open(db, dbfn, NULL, DB_BTREE, DB_CREATE, 0664);
+ ret = (db->open)(db, dbfn, NULL, DB_BTREE, DB_CREATE, 0664);
#endif
if (ret != 0) {
db->err(db, ret, "db->open(%s)", dbfn);
@@ .
Received on Sun Aug 19 01:40:37 2007