Repair rebuilddb lossage, removing debug messages and final copy on user msgs.

Initialize dbN vector from dbNopen.
Use db3 return convention for dbNopen.
Always save tag index in join key.
Rename rpmdbAppendIteratorMatches -> rpmdbAppendIterator.
Remove tolerant from rpmdbRemove API.
Use hdrNum rather than offset, tagNum rather than fileNumber most everywhere.
rpmdb.c: Create rpmdbPruneIterator to exclude items from set.
rpmdb.c: Remove legacy code from rpmdbAdd/rpmdbRemove.
rpmdb.c: Rename (shorten) many routines.
tagName.c: prepare for ADDED/REMOVED/AVAILABLE temorary databases.
depends.c: use rpmdbPruneIterator.
depends.c: don't check ranges unless provides names match.
depends.c: Depends now works (watch out for data values of 0).
rpmpopt.in: Add --dbapi and --rebuilddbapi options.

CVS patchset: 3720
CVS date: 2000/05/07 00:53:11

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/rpmdb.h b/lib/rpmdb.h
index 1fedcbf4e..97c35e028 100644
--- a/lib/rpmdb.h
+++ b/lib/rpmdb.h
@@ -9,7 +9,7 @@
 
 #include "fprint.h"
 
-typedef /*@abstract@*/ struct _dbiIndexRecord * dbiIndexRecord;
+typedef /*@abstract@*/ struct _dbiIndexItem * dbiIndexItem;
 typedef /*@abstract@*/ struct _dbiIndex * dbiIndex;
 
 /* this will break if sizeof(int) != 4 */
@@ -18,9 +18,9 @@ typedef /*@abstract@*/ struct _dbiIndex * dbiIndex;
  * Note: In rpm-3.0.4 and earlier, this structure was passed by value,
  * and was identical to the "data saved" structure below.
  */
-struct _dbiIndexRecord {
-    unsigned int recOffset;		/*!< byte offset of header in db */
-    unsigned int fileNumber;		/*!< file array index */
+struct _dbiIndexItem {
+    unsigned int hdrNum;		/*!< header instance in db */
+    unsigned int tagNum;		/*!< tag index in header */
     unsigned int fpNum;			/*!< finger print index */
     unsigned int dbNum;			/*!< database index */
 };
@@ -38,7 +38,7 @@ typedef	struct _dbiIR * DBIR_t;
  * Items retrieved from the index database.
  */
 struct _dbiIndexSet {
-/*@owned@*/ struct _dbiIndexRecord * recs; /*!< array of records */
+/*@owned@*/ struct _dbiIndexItem * recs; /*!< array of records */
     int count;				/*!< number of records */
 };