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: 27-Jun-2016 05:15:26 Branch: rpm-5_4 Handle: 2016062703152600 Modified files: (Branch: rpm-5_4) rpm/tools dbconvert.c Log: - orphan. Summary: Revision Changes Path 2.1.2.20 +8 -8 rpm/tools/dbconvert.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/tools/dbconvert.c ============================================================================ $ cvs diff -u -r2.1.2.19 -r2.1.2.20 dbconvert.c --- rpm/tools/dbconvert.c 29 Sep 2014 18:36:46 -0000 2.1.2.19 +++ rpm/tools/dbconvert.c 27 Jun 2016 03:15:26 -0000 2.1.2.20 @@ -133,15 +133,15 @@ DBC *dbcpCur = NULL, *dbcpNew = NULL; rdbNew = rpmtsGetRdb(tsNew); dbenvNew = rdbNew->db_dbenv; - dbiIndex dbiCur = dbiOpen(rpmtsGetRdb(tsCur), RPMDBI_PACKAGES, 0); - dbiIndex dbiNew = dbiOpen(rdbNew, RPMDBI_PACKAGES, 0); - DB_TXN *txnidNew = dbiTxnid(dbiNew); + rpmdbi dbiCur = rpmdbiOpen(rpmtsGetRdb(tsCur), RPMDBI_PACKAGES, 0); + rpmdbi dbiNew = rpmdbiOpen(rdbNew, RPMDBI_PACKAGES, 0); + DB_TXN *txnidNew = rpmdbiTxnid(dbiNew); - if (!(xx = dbiCopen(dbiCur, NULL, NULL, 0)) && !(xx = dbiCopen(dbiNew, txnidNew, &dbcpNew, DB_WRITECURSOR))) { + if (!(xx = rpmdbiCopen(dbiCur, NULL, NULL, 0)) && !(xx = rpmdbiCopen(dbiNew, txnidNew, &dbcpNew, DB_WRITECURSOR))) { DB * _dbN = (DB *) dbiNew->dbi_db; DB * _dbO = (DB *) dbiCur->dbi_db; DBT key, data; - DB_TXN *txnidCur = dbiTxnid(dbiCur); + DB_TXN *txnidCur = rpmdbiTxnid(dbiCur); uint32_t nkeys = 0; memset(&key, 0, sizeof(key)); @@ -222,7 +222,7 @@ } fprintf(stderr, "\n"); - if (!(xx = dbiCclose(dbiNew, dbcpNew, 0)) && !(xx = dbiCclose(dbiCur, dbcpCur, 0)) && + if (!(xx = rpmdbiCclose(dbiNew, dbcpNew, 0)) && !(xx = rpmdbiCclose(dbiCur, dbcpCur, 0)) && rebuild) { xx = rpmtsCloseDB(tsCur); @@ -286,7 +286,7 @@ /* TODO: signal handler? */ /* Open (and re-create) each index. */ - (void) dbiOpen(rdbNew, dbiTags->tag, rdbNew->db_flags); + (void) rpmdbiOpen(rdbNew, dbiTags->tag, rdbNew->db_flags); fprintf(stderr, "%d%%\n", (int)(100*((float)dbix/rdbNew->db_ndbi))); fflush(stdout); } @@ -302,7 +302,7 @@ if (!Stat(fn, &sb)) xx = Unlink(fn); fprintf(stderr, "%s:\t", fn); - (void) dbiOpen(rdbNew, RPMDBI_SEQNO, rdbNew->db_flags); + (void) rpmdbiOpen(rdbNew, RPMDBI_SEQNO, rdbNew->db_flags); fprintf(stderr, "100%%\n"); fn = _free(fn); @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org