Use rpm_count_t everywhere for header data count

- typedef'ed as uint32_t as that's the key size limit imposed by BDB,
  relevant for RPM_BIN_TYPE
- easy to change to whatever later on as it's now consistent everywhere

16 files changed, 79 insertions, 71 deletions

diff --git a/lib/formats.c b/lib/formats.c
index 393a78247..38d893d49 100644
--- a/lib/formats.c
+++ b/lib/formats.c
@@ -488,7 +488,7 @@ static char * depflagsFormat(int32_t type, const void * data,
  * @return		0 on success
  */
 static int fsnamesTag( Header h, int32_t * type,
-		void ** data, int32_t * count,
+		void ** data, rpm_count_t * count,
 		int * freeData)
 {
     const char ** list;
@@ -514,7 +514,7 @@ static int fsnamesTag( Header h, int32_t * type,
  */
 static int instprefixTag(Header h, rpmTagType * type,
 		const void ** data,
-		int32_t * count,
+		rpm_count_t * count,
 		int * freeData)
 {
     HGE_t hge = (HGE_t)headerGetEntryMinMemory;
@@ -546,14 +546,14 @@ static int instprefixTag(Header h, rpmTagType * type,
  * @return		0 on success
  */
 static int fssizesTag(Header h, rpmTagType * type,
-		const void ** data, int32_t * count,
+		const void ** data, rpm_count_t * count,
 		int * freeData)
 {
     HGE_t hge = (HGE_t)headerGetEntryMinMemory;
     const char ** filenames;
     int32_t * filesizes;
     uint32_t * usages;
-    int numFiles;
+    rpm_count_t numFiles;
 
     if (!hge(h, RPMTAG_FILESIZES, NULL, (void **) &filesizes, &numFiles)) {
 	filesizes = NULL;
@@ -596,7 +596,7 @@ static int fssizesTag(Header h, rpmTagType * type,
  * @return		0 on success
  */
 static int triggercondsTag(Header h, rpmTagType * type,
-		const void ** data, int32_t * count,
+		const void ** data, rpm_count_t * count,
 		int * freeData)
 {
     HGE_t hge = (HGE_t)headerGetEntryMinMemory;
@@ -604,11 +604,12 @@ static int triggercondsTag(Header h, rpmTagType * type,
     rpmTagType tnt, tvt, tst;
     int32_t * indices, * flags;
     char ** names, ** versions;
-    int numNames, numScripts;
+    rpm_count_t numNames, numScripts;
+    rpm_count_t i, j;
     char ** conds, ** s;
     char * item, * flagsStr;
     char * chptr;
-    int i, j, xx;
+    int xx;
     char buf[5];
 
     if (!hge(h, RPMTAG_TRIGGERNAME, &tnt, (void **) &names, &numNames)) {
@@ -668,7 +669,7 @@ static int triggercondsTag(Header h, rpmTagType * type,
  * @return		0 on success
  */
 static int triggertypeTag(Header h, rpmTagType * type,
-		const void ** data, int32_t * count,
+		const void ** data, rpm_count_t * count,
 		int * freeData)
 {
     HGE_t hge = (HGE_t)headerGetEntryMinMemory;
@@ -677,8 +678,9 @@ static int triggertypeTag(Header h, rpmTagType * type,
     int32_t * indices, * flags;
     const char ** conds;
     const char ** s;
-    int i, j, xx;
-    int numScripts, numNames;
+    int xx;
+    rpm_count_t numScripts, numNames;
+    rpm_count_t i, j;
 
     if (!hge(h, RPMTAG_TRIGGERINDEX, NULL, (void **) &indices, &numNames)) {
 	*freeData = 0;
@@ -725,7 +727,7 @@ static int triggertypeTag(Header h, rpmTagType * type,
  * @return		0 on success
  */
 static int filenamesTag(Header h, rpmTagType * type,
-		const void ** data, int32_t * count,
+		const void ** data, rpm_count_t * count,
 		int * freeData)
 {
     *type = RPM_STRING_ARRAY_TYPE;
@@ -744,7 +746,7 @@ static int filenamesTag(Header h, rpmTagType * type,
  * @return		0 on success
  */
 static int fileclassTag(Header h, rpmTagType * type,
-		const void ** data, int32_t * count,
+		const void ** data, rpm_count_t * count,
 		int * freeData)
 {
     *type = RPM_STRING_ARRAY_TYPE;
@@ -763,7 +765,7 @@ static int fileclassTag(Header h, rpmTagType * type,
  * @return		0 on success
  */
 static int fileprovideTag(Header h, rpmTagType * type,
-		const void ** data, int32_t * count,
+		const void ** data, rpm_count_t * count,
 		int * freeData)
 {
     *type = RPM_STRING_ARRAY_TYPE;
@@ -782,7 +784,7 @@ static int fileprovideTag(Header h, rpmTagType * type,
  * @return		0 on success
  */
 static int filerequireTag(Header h, rpmTagType * type,
-		const void ** data, int32_t * count,
+		const void ** data, rpm_count_t * count,
 		int * freeData)
 {
     *type = RPM_STRING_ARRAY_TYPE;
@@ -811,7 +813,7 @@ static const char * _macro_i18ndomains = "%{?_i18ndomains}";
  * @return		0 on success
  */
 static int i18nTag(Header h, int32_t tag, rpmTagType * type,
-		const void ** data, int32_t * count,
+		const void ** data, rpm_count_t * count,
 		int * freeData)
 {
     HGE_t hge = (HGE_t)headerGetEntryMinMemory;
@@ -903,7 +905,7 @@ static int i18nTag(Header h, int32_t tag, rpmTagType * type,
  * @return		0 on success
  */
 static int summaryTag(Header h, rpmTagType * type,
-		const void ** data, int32_t * count,
+		const void ** data, rpm_count_t * count,
 		int * freeData)
 {
     return i18nTag(h, RPMTAG_SUMMARY, type, data, count, freeData);
@@ -919,7 +921,7 @@ static int summaryTag(Header h, rpmTagType * type,
  * @return		0 on success
  */
 static int descriptionTag(Header h, rpmTagType * type,
-		const void ** data, int32_t * count,
+		const void ** data, rpm_count_t * count,
 		int * freeData)
 {
     return i18nTag(h, RPMTAG_DESCRIPTION, type, data, count, freeData);
@@ -935,7 +937,7 @@ static int descriptionTag(Header h, rpmTagType * type,
  * @return		0 on success
  */
 static int groupTag(Header h, rpmTagType * type,
-		const void ** data, int32_t * count,
+		const void ** data, rpm_count_t * count,
 		int * freeData)
 {
     return i18nTag(h, RPMTAG_GROUP, type, data, count, freeData);
diff --git a/lib/fs.c b/lib/fs.c
index f630cddda..075731c8f 100644
--- a/lib/fs.c
+++ b/lib/fs.c
@@ -241,7 +241,7 @@ static int getFilesystemList(void)
 }
 #endif	/* HAVE_MNTCTL */
 
-int rpmGetFilesystemList(const char *** listptr, int * num)
+int rpmGetFilesystemList(const char *** listptr, unsigned int * num)
 {
     if (!fsnames) 
 	if (getFilesystemList())
@@ -253,7 +253,8 @@ int rpmGetFilesystemList(const char *** listptr, int * num)
     return 0;
 }
 
-int rpmGetFilesystemUsage(const char ** fileList, int32_t * fssizes, int numFiles,
+int rpmGetFilesystemUsage(const char ** fileList, int32_t * fssizes, 
+			  unsigned int numFiles,
 			  uint32_t ** usagesPtr, int flags)
 {
     uint32_t * usages;
diff --git a/lib/idtx.c b/lib/idtx.c
index 4553f72df..3c2240048 100644
--- a/lib/idtx.c
+++ b/lib/idtx.c
@@ -77,7 +77,7 @@ IDTX IDTXload(rpmts ts, rpmTag tag)
 #endif
     while ((h = rpmdbNextIterator(mi)) != NULL) {
 	rpmTagType type = RPM_NULL_TYPE;
-	int32_t count = 0;
+	rpm_count_t count = 0;
 	int32_t * tidp;
 
 	tidp = NULL;
@@ -126,7 +126,7 @@ IDTX IDTXglob(rpmts ts, const char * globstr, rpmTag tag)
     if (xx == 0)
     for (i = 0; i < ac; i++) {
 	rpmTagType type;
-	int32_t count;
+	rpm_count_t count;
 	int isSource;
 
 	fd = Fopen(av[i], "r.ufdio");
diff --git a/lib/legacy.c b/lib/legacy.c
index ba0d03402..fde9b4b2f 100644
--- a/lib/legacy.c
+++ b/lib/legacy.c
@@ -34,8 +34,8 @@ void compressFilelist(Header h)
     const char ** baseNames;
     uint32_t * dirIndexes;
     rpmTagType fnt;
-    int count;
-    int i, xx;
+    rpm_count_t count, i;
+    int xx;
     int dirIndex = -1;
 
     /*
@@ -115,7 +115,7 @@ void expandFilelist(Header h)
     HAE_t hae = (HAE_t)headerAddEntry;
     HRE_t hre = (HRE_t)headerRemoveEntry;
     const char ** fileNames = NULL;
-    int count = 0;
+    rpm_count_t count = 0;
     int xx;
 
     if (!headerIsEntry(h, RPMTAG_OLDFILENAMES)) {
@@ -149,8 +149,8 @@ void providePackageNVR(Header h)
     const char ** providesEVR = NULL;
     rpmTagType pnt, pvt;
     int32_t * provideFlags = NULL;
-    int providesCount;
-    int i, xx;
+    rpm_count_t providesCount, i;
+    int xx;
     int bingo = 1;
 
     /* Generate provides for this package name-version-release. */
diff --git a/lib/package.c b/lib/package.c
index f345b3b38..d2884c862 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -87,7 +87,8 @@ void headerMergeLegacySigs(Header h, const Header sigh)
     HFD_t hfd = (HFD_t) headerFreeData;
     HAE_t hae = (HAE_t) headerAddEntry;
     HeaderIterator hi;
-    int32_t tag, type, count;
+    int32_t tag, type;
+    rpm_count_t count;
     const void * ptr;
     int xx;
 
@@ -167,7 +168,8 @@ Header headerRegenSigHeader(const Header h, int noArchiveSize)
     HFD_t hfd = (HFD_t) headerFreeData;
     Header sigh = rpmNewSignature();
     HeaderIterator hi;
-    int32_t tag, stag, type, count;
+    rpm_count_t count;
+    int32_t tag, stag, type;
     const void * ptr;
     int xx;
 
@@ -682,7 +684,7 @@ rpmRC rpmReadPackageFile(rpmts ts, FD_t fd, const char * fn, Header * hdrp)
     int32_t sigtag;
     int32_t sigtype;
     const void * sig;
-    int32_t siglen;
+    rpm_count_t siglen;
     rpmtsOpX opx;
     size_t nb;
     Header h = NULL;
@@ -822,7 +824,7 @@ rpmRC rpmReadPackageFile(rpmts ts, FD_t fd, const char * fn, Header * hdrp)
 	}
     {	void * uh = NULL;
 	int32_t uht;
-	int32_t uhc;
+	rpm_count_t uhc;
 
 	if (!headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc))
 	    break;
@@ -849,7 +851,7 @@ rpmRC rpmReadPackageFile(rpmts ts, FD_t fd, const char * fn, Header * hdrp)
     case RPMSIGTAG_SHA1:
     {	void * uh = NULL;
 	int32_t uht;
-	int32_t uhc;
+	rpm_count_t uhc;
 
 	if (!headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc))
 	    break;
diff --git a/lib/psm.c b/lib/psm.c
index c21aa1652..b2fd2a3a6 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -178,7 +178,7 @@ static rpmRC markReplacedFiles(const rpmpsm psm)
     while ((h = rpmdbNextIterator(mi)) != NULL) {
 	char * secStates;
 	int modified;
-	int count;
+	rpm_count_t count;
 
 	modified = 0;
 
@@ -582,7 +582,7 @@ static rpmRC runScript(rpmpsm psm, Header h, rpmTag stag,
     const char ** argv = NULL;
     int argc = 0;
     const char ** prefixes = NULL;
-    int numPrefixes;
+    rpm_count_t numPrefixes;
     rpmTagType ipt;
     const char * oldPrefix;
     int maxPrefixLength;
@@ -908,7 +908,7 @@ static rpmRC runInstScript(rpmpsm psm)
     HGE_t hge = fi->hge;
     HFD_t hfd = (fi->hfd ? fi->hfd : headerFreeData);
     void ** progArgv;
-    int progArgc;
+    rpm_count_t progArgc;
     const char ** argv;
     rpmTagType ptt, stt;
     const char * script;
@@ -1095,10 +1095,9 @@ static rpmRC runImmedTriggers(rpmpsm psm)
     HGE_t hge = fi->hge;
     HFD_t hfd = (fi->hfd ? fi->hfd : headerFreeData);
     const char ** triggerNames;
-    int numTriggers;
-    int32_t * triggerIndices;
+    rpm_count_t numTriggers, numTriggerIndices;
+    rpm_count_t * triggerIndices;
     rpmTagType tnt, tit;
-    int numTriggerIndices;
     unsigned char * triggersRun;
     rpmRC rc = RPMRC_OK;
 
@@ -1477,7 +1476,8 @@ assert(psm->mi == NULL);
 
 	    /* Regenerate original header. */
 	    {	void * uh = NULL;
-		int32_t uht, uhc;
+		int32_t uht;
+		rpm_count_t uhc;
 
 		if (headerGetEntry(fi->h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc)) {
 		    psm->oh = headerCopyLoad(uh);
@@ -1486,7 +1486,8 @@ assert(psm->mi == NULL);
 		if (headerGetEntry(fi->h, RPMTAG_HEADERIMAGE, &uht, &uh, &uhc))
 		{
 		    HeaderIterator hi;
-		    int32_t tag, type, count;
+		    int32_t tag, type;
+		    rpm_count_t count;
 		    hPTR_t ptr;
 		    Header oh;
 
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index f4fd56c5c..8e7d9bbea 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -125,7 +125,7 @@ static int getSignid(Header sig, int sigtag, pgpKeyID_t signid)
 {
     void * pkt = NULL;
     int32_t pkttyp = 0;
-    int32_t pktlen = 0;
+    rpm_count_t pktlen = 0;
     int rc = 1;
 
     if (headerGetEntry(sig, sigtag, &pkttyp, &pkt, &pktlen) && pkt != NULL) {
@@ -162,7 +162,8 @@ static int rpmReSign(rpmts ts,
     Header sigh = NULL;
     const char * msg;
     void * uh = NULL;
-    int32_t uht, uhc;
+    int32_t uht;
+    rpm_count_t uhc;
     int res = EXIT_FAILURE;
     int deleting = (qva->qva_mode == RPMSIGN_DEL_SIGNATURE);
     rpmRC rc;
@@ -217,7 +218,8 @@ static int rpmReSign(rpmts ts,
 	/* Dump the immutable region (if present). */
 	if (headerGetEntry(sigh, RPMTAG_HEADERSIGNATURES, &uht, &uh, &uhc)) {
 	    HeaderIterator hi;
-	    int32_t tag, type, count;
+	    int32_t tag, type;
+	    rpm_count_t count;
 	    hPTR_t ptr;
 	    Header oh;
 	    Header nh;
@@ -475,7 +477,8 @@ static int readFile(FD_t fd, const char * fn, pgpDig dig)
 
 	if (headerIsEntry(h, RPMTAG_HEADERIMMUTABLE)) {
 	    void * uh;
-	    int32_t uht, uhc;
+	    int32_t uht;
+	    rpm_count_t uhc;
 	
 	    if (!headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc)
 	    ||   uh == NULL)
@@ -523,7 +526,7 @@ int rpmVerifySignatures(QVA_t qva, rpmts ts, FD_t fd,
     const void * sig;
     pgpDig dig;
     pgpDigParams sigp;
-    int32_t siglen;
+    rpm_count_t siglen;
     Header sigh = NULL;
     HeaderIterator hi;
     const char * msg;
diff --git a/lib/rpmds.c b/lib/rpmds.c
index fc1a69b69..4bbdd66fe 100644
--- a/lib/rpmds.c
+++ b/lib/rpmds.c
@@ -130,7 +130,7 @@ rpmds rpmdsNew(Header h, rpmTag tagN, int flags)
     const char * Type;
     const char ** N;
     rpmTagType Nt;
-    int32_t Count;
+    rpm_count_t Count;
 
     if (tagN == RPMTAG_PROVIDENAME) {
 	Type = "Provides";
diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index dd3e86207..9b386c104 100644
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -630,13 +630,11 @@ Header relocateFileList(const rpmts ts, rpmfi fi,
     int numRelocations;
     const char ** validRelocations;
     rpmTagType validType;
-    int numValid;
     const char ** baseNames;
     const char ** dirNames;
     uint32_t * dirIndexes;
     uint32_t * newDirIndexes;
-    int32_t fileCount;
-    int32_t dirCount;
+    rpm_count_t fileCount, dirCount, numValid;
     uint32_t mydColor = rpmExpandNumeric("%{?_autorelocate_dcolor}");
     uint32_t * fFlags = NULL;
     uint32_t * fColors = NULL;
@@ -1003,7 +1001,7 @@ dColors[j] |= fColors[i];
 
     /* Save original filenames in header and replace (relocated) filenames. */
     if (nrelocated) {
-	int c;
+	rpm_count_t c;
 	void * d;
 	rpmTagType t;
 
@@ -1392,8 +1390,7 @@ fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, Type, (fi ? fi->fc : 0));
     return rpmfiLink(fi, (fi ? fi->Type : NULL));
 }
 
-void rpmfiBuildFClasses(Header h,
-	const char *** fclassp, int * fcp)
+void rpmfiBuildFClasses(Header h, const char *** fclassp, rpm_count_t * fcp)
 {
     int scareMem = 0;
     rpmfi fi = rpmfiNew(NULL, h, RPMTAG_BASENAMES, scareMem);
@@ -1445,7 +1442,7 @@ exit:
 }
 
 void rpmfiBuildFDeps(Header h, rpmTag tagN,
-	const char *** fdepsp, int * fcp)
+	const char *** fdepsp, rpm_count_t * fcp)
 {
     int scareMem = 0;
     rpmfi fi = rpmfiNew(NULL, h, RPMTAG_BASENAMES, scareMem);
@@ -1540,14 +1537,14 @@ exit:
 }
 
 void rpmfiBuildFNames(Header h, rpmTag tagN,
-	const char *** fnp, int * fcp)
+	const char *** fnp, rpm_count_t * fcp)
 {
     HGE_t hge = (HGE_t)headerGetEntryMinMemory;
     HFD_t hfd = headerFreeData;
     const char ** baseNames;
     const char ** dirNames;
     uint32_t * dirIndexes;
-    int count;
+    rpm_count_t count;
     const char ** fileNames;
     int size;
     rpmTag dirNameTag = 0;
diff --git a/lib/rpmfi.h b/lib/rpmfi.h
index 021a0b898..0107962b9 100644
--- a/lib/rpmfi.h
+++ b/lib/rpmfi.h
@@ -354,7 +354,7 @@ rpmfi rpmfiNew(const rpmts ts, Header h, rpmTag tagN, int scareMem);
  * @retval *fcp		number of files
  */
 void rpmfiBuildFClasses(Header h,
-		const char *** fclassp, int * fcp);
+		const char *** fclassp, rpm_count_t * fcp);
 
 
 /** \ingroup rpmfi
@@ -368,7 +368,7 @@ void rpmfiBuildFClasses(Header h,
  * @retval *fcp		number of files
  */
 void rpmfiBuildFDeps(Header h, rpmTag tagN,
-		const char *** fdepsp, int * fcp);
+		const char *** fdepsp, rpm_count_t * fcp);
 
 /** \ingroup rpmfi
  * Retrieve file names from header.
@@ -388,7 +388,7 @@ void rpmfiBuildFDeps(Header h, rpmTag tagN,
  * @retval *fcp		number of files
  */
 void rpmfiBuildFNames(Header h, rpmTag tagN,
-		const char *** fnp, int * fcp);
+		const char *** fnp, rpm_count_t * fcp);
 
 /** \ingroup rpmfi
  * Return file type from mode_t.
diff --git a/lib/rpmfi_internal.h b/lib/rpmfi_internal.h
index 551d298ec..4d51e1e77 100644
--- a/lib/rpmfi_internal.h
+++ b/lib/rpmfi_internal.h
@@ -61,19 +61,19 @@ struct rpmfi_s {
     const char ** fcontexts;	/*! FIle security contexts. */
 
     const char ** cdict;	/*!< File class dictionary (header) */
-    int32_t ncdict;		/*!< No. of class entries. */
+    rpm_count_t ncdict;		/*!< No. of class entries. */
     const uint32_t * fcdictx;	/*!< File class dictionary index (header) */
 
     const uint32_t * ddict;	/*!< File depends dictionary (header) */
-    int32_t nddict;		/*!< No. of depends entries. */
+    rpm_count_t nddict;		/*!< No. of depends entries. */
     const uint32_t * fddictx;	/*!< File depends dictionary start (header) */
     const uint32_t * fddictn;	/*!< File depends dictionary count (header) */
 
 /*?null?*/
     const uint32_t * vflags;	/*!< File verify flag(s) (from header) */
 
-    int32_t dc;			/*!< No. of directories. */
-    int32_t fc;			/*!< No. of files. */
+    rpm_count_t dc;		/*!< No. of directories. */
+    rpm_count_t fc;		/*!< No. of files. */
 
 /*=============================*/
     rpmte te;
diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index ade1bae3d..16aac5281 100644
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -474,7 +474,7 @@ if (fileURL[0] == '=') {
 	if (eiu->relocations) {
 	    const char ** paths;
 	    int pft;
-	    int c;
+	    rpm_count_t c;
 
 	    if (headerGetEntry(eiu->h, RPMTAG_PREFIXES, &pft,
 				       (void **) &paths, &c) && (c == 1))
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 4ac5dcbe9..6f7b9f848 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -207,7 +207,7 @@ typedef
 typedef int (*HGE_t) (Header h, rpmTag tag,
 			rpmTagType * type,
 			void ** p,
-			int32_t * c);
+			rpm_count_t * c);
 
 /**
  * Prototype for headerAddEntry() vector.
@@ -225,7 +225,7 @@ typedef int (*HGE_t) (Header h, rpmTag tag,
  * @return              1 on success, 0 on failure
  */
 typedef int (*HAE_t) (Header h, rpmTag tag, rpmTagType type,
-			const void * p, int32_t c);
+			const void * p, rpm_count_t c);
 
 /**
  * Prototype for headerModifyEntry() vector.
@@ -239,7 +239,7 @@ typedef int (*HAE_t) (Header h, rpmTag tag, rpmTagType type,
  * @return		1 on success, 0 on failure
  */
 typedef int (*HME_t) (Header h, rpmTag tag, rpmTagType type,
-			const void * p, int32_t c);
+			const void * p, rpm_count_t c);
 
 /**
  * Prototype for headerRemoveEntry() vector.
@@ -382,7 +382,7 @@ void rpmFreeFilesystems(void);
  * @return			0 on success, 1 on error
  */
 int rpmGetFilesystemList( const char *** listptr,
-		int * num);
+		unsigned int * num);
 
 /**
  * Determine per-file system usage for a list of files.
@@ -394,7 +394,7 @@ int rpmGetFilesystemList( const char *** listptr,
  * @return			0 on success, 1 on error
  */
 int rpmGetFilesystemUsage(const char ** fileList, int32_t * fssizes,
-		int numFiles, uint32_t ** usagesPtr,
+		unsigned int numFiles, uint32_t ** usagesPtr,
 		int flags);
 
 /* ==================================================================== */
diff --git a/lib/rpmts.c b/lib/rpmts.c
index ccb2b15a5..3014674ca 100644
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -298,7 +298,8 @@ fprintf(stderr, "*** free pkt %p[%d] id %08x %08x\n", ts->pkpkt, ts->pkpktlen, p
 	mi = rpmtsInitIterator(ts, RPMTAG_PUBKEYS, sigp->signid, sizeof(sigp->signid));
 	while ((h = rpmdbNextIterator(mi)) != NULL) {
 	    const char ** pubkeys;
-	    int32_t pt, pc;
+	    int32_t pt;
+	    rpm_count_t pc;
 
 	    if (!headerGetEntry(h, RPMTAG_PUBKEYS, &pt, (void **)&pubkeys, &pc))
 		continue;
diff --git a/lib/rpmts_internal.h b/lib/rpmts_internal.h
index 3a41bf8fc..a437193b1 100644
--- a/lib/rpmts_internal.h
+++ b/lib/rpmts_internal.h
@@ -54,7 +54,7 @@ struct rpmts_s {
     rpmprobFilterFlags ignoreSet;
 				/*!< Bits to filter current problems. */
 
-    int filesystemCount;	/*!< No. of mounted filesystems. */
+    unsigned int filesystemCount;	/*!< No. of mounted filesystems. */
     const char ** filesystems;	/*!< Mounted filesystem names. */
     rpmDiskSpaceInfo dsi;	/*!< Per filesystem disk/inode usage. */
 
diff --git a/lib/signature.c b/lib/signature.c
index f28f03454..fa723110f 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -638,7 +638,8 @@ static int makeHDRSignature(Header sigh, const char * file, int32_t sigTag,
 	if (headerIsEntry(h, RPMTAG_HEADERIMMUTABLE)) {
 	    DIGEST_CTX ctx;
 	    void * uh;
-	    int32_t uht, uhc;
+	    int32_t uht;
+	    rpm_count_t uhc;
 	
 	    if (!headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc)
 	     ||  uh == NULL)