folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use (xxx->open)() to work-around glibc's open() behaving having changed.

This commit is contained in:
Ralf Corsépius 2007-08-23 10:09:13 +02:00
parent 2a98ab385d
commit a8997f4716
21 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/db185/db185.c
View File

@ -227,7 +227,7 @@ __db185_open(file, oflags, mode, type, openinfo)
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;

4
db/db_archive/db_archive.c
View File

@ -119,9 +119,9 @@ main(argc, argv)
* 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;

4
db/db_checkpoint/db_checkpoint.c
View File

@ -141,9 +141,9 @@ main(argc, argv)
* 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;

4
db/db_codegen/code_capi.c
View File

@ -368,7 +368,7 @@ static int\nbdb_env_startup(env_list_t *ep)\n{\n\
\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 @@ api_c_db()
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\

2
db/db_deadlock/db_deadlock.c
View File

@ -157,7 +157,7 @@ main(argc, argv)
}
/* 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;
}

8
db/db_dump/db_dump.c
View File

@ -199,7 +199,7 @@ retry: if ((ret = db_env_create(&dbenv, 0)) != 0) {
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 @@ db_init(dbenv, home, is_salvage, cache, is_privatep)
* 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 @@ db_init(dbenv, home, is_salvage, cache, is_privatep)
*/
*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 @@ dump_sub(dbenv, parent_dbp, parent_name, pflag, keyflag)
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);

6
db/db_hotbackup/db_hotbackup.c
View File

@ -418,9 +418,9 @@ env_init(dbenvp, home, log_dirp, data_dirp, passwd, which)
* 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 @@ env_init(dbenvp, home, log_dirp, data_dirp, passwd, which)
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);

6
db/db_load/db_load.c
View File

@ -394,7 +394,7 @@ retry_db:
#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 @@ db_init(dbenv, home, cache, is_private)
/* 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 @@ db_init(dbenv, home, cache, is_private)
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. */

10
db/db_printlog/db_printlog.c
View File

@ -173,18 +173,18 @@ main(argc, argv)
* 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 @@ open_rep_db(dbenv, dbpp, dbcp)
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;
}

2
db/db_recover/db_recover.c
View File

@ -138,7 +138,7 @@ main(argc, argv)
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;
}

8
db/db_stat/db_stat.c
View File

@ -282,9 +282,9 @@ retry: if ((ret = db_env_create(&dbenv, 0)) != 0) {
* 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 @@ db_init(dbenv, home, ttype, cache, is_private)
* 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 @@ db_init(dbenv, home, ttype, cache, is_private)
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. */

4
db/db_upgrade/db_upgrade.c
View File

@ -119,9 +119,9 @@ main(argc, argv)
* 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");

6
db/db_verify/db_verify.c
View File

@ -129,7 +129,7 @@ retry: if ((ret = db_env_create(&dbenv, 0)) != 0) {
*/
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 @@ retry: if ((ret = db_env_create(&dbenv, 0)) != 0) {
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 @@ retry: if ((ret = db_env_create(&dbenv, 0)) != 0) {
goto shutdown;
}
ret = dbp1->open(dbp1,
ret = (dbp1->open)(dbp1,
NULL, argv[0], NULL, DB_UNKNOWN, DB_RDONLY, 0);
/*

2
db/dbm/dbm.c
View File

@ -230,7 +230,7 @@ __db_ndbm_open(file, oflags, mode)
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);

2
db/hsearch/hsearch.c
View File

@ -75,7 +75,7 @@ __db_hcreate(nel)
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);

6
db/libdb_java/db_java_wrap.c
View File

@ -2501,7 +2501,7 @@ SWIGINTERN db_ret_t Db_key_range(struct Db *self,DB_TXN *txnid,DBT *key,DB_KEY_R
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 @@ SWIGINTERN db_ret_t DbEnv_lsn_reset(struct DbEnv *self,char const *file,u_int32_
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 @@ SWIGINTERN db_ret_t DbSequence_initial_value(struct DbSequence *self,db_seq_t va
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);

2
db/mutex/test_mutex.c
View File

@ -673,7 +673,7 @@ tm_env_init()
home = TESTDIR;
if (nthreads != 1)
flags |= DB_THREAD;
if ((ret = dbenv->open(dbenv, home, flags, 0)) != 0) {
if ((ret = (dbenv->open)(dbenv, home, flags, 0)) != 0) {
dbenv->err(dbenv, ret, "environment open: %s", home);
return (1);
}

4
db/rpc_server/c/db_server_proc.c
View File

@ -394,7 +394,7 @@ __env_open_proc(dbenvcl_id, home, flags, mode, replyp)
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 @@ __db_open_proc(dbpcl_id, txnpcl_id, name, subdb, type, flags, mode, replyp)
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;

2
db/rpc_server/c/db_server_util.c
View File

@ -802,7 +802,7 @@ env_recover(progname)
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;
}

2
db/xa/xa.c
View File

@ -206,7 +206,7 @@ __db_xa_open(xa_info, rmid, arg_flags)
/* 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. */

2
db/xa/xa_db.c
View File

@ -131,7 +131,7 @@ __xa_open(dbp, txn, name, subdb, type, flags, mode)
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. */