From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 12 Jul 2007 09:30:26 +0000 (+0300)
Subject: Use uint_32 for dirindexes everywhere
X-Git-Tag: rpm-4.6.0-rc1~2264
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e12cf3d1cc653dfac7bb7fe3f9aa801ab0536c88;p=platform%2Fupstream%2Frpm.git

Use uint_32 for dirindexes everywhere
---

diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index 19a45d3..bdc91e3 100644
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -671,8 +671,8 @@ Header relocateFileList(const rpmts ts, rpmfi fi,
     int numValid;
     const char ** baseNames;
     const char ** dirNames;
-    int_32 * dirIndexes;
-    int_32 * newDirIndexes;
+    uint_32 * dirIndexes;
+    uint_32 * newDirIndexes;
     int_32 fileCount;
     int_32 dirCount;
     uint_32 mydColor = rpmExpandNumeric("%{?_autorelocate_dcolor}");
diff --git a/rpmdb/fprint.c b/rpmdb/fprint.c
index 2244a91..1d5bf40 100644
--- a/rpmdb/fprint.c
+++ b/rpmdb/fprint.c
@@ -234,7 +234,7 @@ int fpEqual(const void * key1, const void * key2)
 
 /*@-bounds@*/
 void fpLookupList(fingerPrintCache cache, const char ** dirNames, 
-		  const char ** baseNames, const int * dirIndexes, 
+		  const char ** baseNames, const uint_32 * dirIndexes, 
 		  int fileCount, fingerPrint * fpList)
 {
     int i;
@@ -270,7 +270,7 @@ void fpLookupHeader(fingerPrintCache cache, Header h, fingerPrint * fpList)
     HFD_t hfd = headerFreeData;
     const char ** baseNames, ** dirNames;
     rpmTagType bnt, dnt;
-    int_32 * dirIndexes;
+    uint_32 * dirIndexes;
     int fileCount;
     int xx;
 
diff --git a/rpmdb/fprint.h b/rpmdb/fprint.h
index 79bb7e4..09ef526 100644
--- a/rpmdb/fprint.h
+++ b/rpmdb/fprint.h
@@ -140,7 +140,7 @@ int fpEqual(const void * key1, const void * key2)
  * @retval fpList	pointer to array of finger prints
  */
 void fpLookupList(fingerPrintCache cache, const char ** dirNames, 
-		  const char ** baseNames, const int * dirIndexes, 
+		  const char ** baseNames, const uint_32 * dirIndexes, 
 		  int fileCount, fingerPrint * fpList)
 	/*@modifies cache, *fpList @*/;
 
diff --git a/rpmdb/legacy.c b/rpmdb/legacy.c
index fe13b0a..efc9e79 100644
--- a/rpmdb/legacy.c
+++ b/rpmdb/legacy.c
@@ -275,7 +275,7 @@ void compressFilelist(Header h)
     char ** fileNames;
     const char ** dirNames;
     const char ** baseNames;
-    int_32 * dirIndexes;
+    uint_32 * dirIndexes;
     rpmTagType fnt;
     int count;
     int i, xx;
@@ -365,7 +365,7 @@ void rpmfiBuildFNames(Header h, rpmTag tagN,
     HFD_t hfd = headerFreeData;
     const char ** baseNames;
     const char ** dirNames;
-    int * dirIndexes;
+    uint_32 * dirIndexes;
     int count;
     const char ** fileNames;
     int size;
diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index 0a55957..f23bea4 100644
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -1283,7 +1283,7 @@ if (rc == 0)
     if (allMatches != NULL)
     while (i < allMatches->count) {
 	const char ** baseNames, ** dirNames;
-	int_32 * dirIndexes;
+	uint_32 * dirIndexes;
 	unsigned int offset = dbiIndexRecordOffset(allMatches, i);
 	unsigned int prevoff;
 	Header h;
@@ -3447,8 +3447,8 @@ if (key->size == 0) key->size++;	/* XXX "/" fixup. */
 	const char ** baseNames;
 	const char ** fullBaseNames;
 	rpmTagType bnt, dnt;
-	int_32 * dirIndexes;
-	int_32 * fullDirIndexes;
+	uint_32 * dirIndexes;
+	uint_32 * fullDirIndexes;
 	fingerPrint * fps;
 	dbiIndexItem im;
 	int start;
diff --git a/tools/convertdb1.c b/tools/convertdb1.c
index aad86cb..04120fa 100644
--- a/tools/convertdb1.c
+++ b/tools/convertdb1.c
@@ -133,7 +133,7 @@ static void compressFilelist(Header h)
     char ** fileNames;
     const char ** dirNames;
     const char ** baseNames;
-    int_32 * dirIndexes;
+    uint_32 * dirIndexes;
     rpmTagType fnt;
     int count;
     int i, xx;