- remove dead code frpm popt table reorg.

- more CLI typedefs/prototypes moved from rpmlib.h to rpmcli.h.
- rpm --verify skips files in non-installed states.
- rpm --verify skips content checks for %ghost files.
- rpm --verify displays config/doc/gnost/license/readme atrrs for files.
- rpm --verify checks immutable header region digest if available.
- rpmbuild adds header region digest (SHA1 as string).
- use rpmTag* typedefs in new hge/hae/hme/hre header vectors.

CVS patchset: 4854
CVS date: 2001/06/12 04:10:21

2 files changed, 6 insertions, 6 deletions

diff --git a/rpmdb/fprint.c b/rpmdb/fprint.c
index d85b8df40..d300f5724 100644
--- a/rpmdb/fprint.c
+++ b/rpmdb/fprint.c
@@ -238,7 +238,7 @@ void fpLookupHeader(fingerPrintCache cache, Header h, fingerPrint * fpList)
     HGE_t hge = (HGE_t)headerGetEntryMinMemory;
     HFD_t hfd = headerFreeData;
     const char ** baseNames, ** dirNames;
-    int bnt, dnt;
+    rpmTagType bnt, dnt;
     int_32 * dirIndexes;
     int fileCount;
 
diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index 3a1aca5af..e3d7669e3 100644
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -1050,7 +1050,7 @@ static int rpmdbFindByFile(rpmdb db, /*@null@*/ const char * filespec,
     HFD_t hfd = headerFreeData;
     const char * dirName;
     const char * baseName;
-    int bnt, dnt;
+    rpmTagType bnt, dnt;
     fingerPrintCache fpc;
     fingerPrint fp1;
     dbiIndex dbi = NULL;
@@ -1881,7 +1881,7 @@ int rpmdbRemove(rpmdb rpmdb, int rid, unsigned int hdrNum)
 	    DBC * dbcursor = NULL;
 	    const char *av[1];
 	    const char ** rpmvals = NULL;
-	    int rpmtype = 0;
+	    rpmTagType rpmtype = 0;
 	    int rpmcnt = 0;
 	    int rpmtag;
 	    int xx;
@@ -2047,7 +2047,7 @@ int rpmdbAdd(rpmdb rpmdb, int iid, Header h)
     HFD_t hfd = headerFreeData;
     sigset_t signalMask;
     const char ** baseNames;
-    int bnt;
+    rpmTagType bnt;
     int count = 0;
     dbiIndex dbi;
     int dbix;
@@ -2135,7 +2135,7 @@ int rpmdbAdd(rpmdb rpmdb, int iid, Header h)
 	    DBC * dbcursor = NULL;
 	    const char *av[1];
 	    const char **rpmvals = NULL;
-	    int rpmtype = 0;
+	    rpmTagType rpmtype = 0;
 	    int rpmcnt = 0;
 	    int rpmtag;
 	    int_32 * requireFlags;
@@ -2338,7 +2338,7 @@ int rpmdbFindFpList(rpmdb rpmdb, fingerPrint * fpList, dbiIndexSet * matchList,
 	const char ** dirNames;
 	const char ** baseNames;
 	const char ** fullBaseNames;
-	int bnt, dnt;
+	rpmTagType bnt, dnt;
 	int_32 * dirIndexes;
 	int_32 * fullDirIndexes;
 	fingerPrint * fps;