RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 05-Oct-2009 04:48:47
Branch: HEAD Handle: 2009100502484600
Modified files:
rpm/rpmdb db3.c
Log:
- dbi: use the (otherwise pointless) db3verify() wrapper.
Summary:
Revision Changes Path
1.112 +5 -9 rpm/rpmdb/db3.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmdb/db3.c
============================================================================
$ cvs diff -u -r1.111 -r1.112 db3.c
--- rpm/rpmdb/db3.c 5 Oct 2009 02:13:44 -0000 1.111
+++ rpm/rpmdb/db3.c 5 Oct 2009 02:48:46 -0000 1.112
@@ -726,6 +726,7 @@
return rc;
}
/*...@=mustmod@*/
+#endif /* NOTYET */
/*...@-mustmod@*/
static int db3verify(dbiIndex dbi, /*...@null@*/ const char * dbfile,
@@ -746,7 +747,6 @@
return rc;
}
/*...@=mustmod@*/
-#endif /* NOTYET */
static int db3sync(dbiIndex dbi, unsigned int flags)
/*...@globals fileSystem @*/
@@ -1262,7 +1262,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;
@@ -1274,20 +1274,16 @@
if (db != NULL) {
/*...@-mods@*/
const char * dbf = rpmGetPath(dbhome, "/", dbfile, NULL);
+ const char * _dbsubfile = NULL;
+ FILE * _fp = NULL;
/*...@=mods@*/
- rc = db->verify(db, dbf, NULL, NULL, flags);
- rc = cvtdberr(dbi, "db->verify", rc, _debug);
+ rc = db3verify(dbi, dbf, _dbsubfile, _fp, flags);
rpmlog(RPMLOG_DEBUG, D_("verified db index %s/%s\n"),
(dbhome ? dbhome : ""),
(dbfile ? dbfile : dbiBN));
- /*
- * The DB handle may not be accessed again after
- * DB->verify is called, regardless of its return.
- */
- db = NULL;
dbf = _free(dbf);
}
xx = dbenv->close(dbenv, 0);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
