From: J. Ali Harlow <ali@juiblex.co.uk>
Date: Thu, 12 Mar 2009 20:52:12 +0000 (+0000)
Subject: Avoid use of legacy rpm library types
X-Git-Tag: 0.1~22
X-Git-Url: http://project.juiblex.co.uk/git/?a=commitdiff_plain;h=a7121b6e7607201e03255574c88e1ec1d1313022;p=razor.git

Avoid use of legacy rpm library types
---

diff --git a/src/import-rpmdb.c b/src/import-rpmdb.c
index a5c15a1..bb69c7b 100644
--- a/src/import-rpmdb.c
+++ b/src/import-rpmdb.c
@@ -31,8 +31,8 @@ union rpm_entry {
 	void *p;
 	char *string;
 	char **list;
-	uint_32 *flags;
-	uint_32 integer;
+	uint32_t *flags;
+	uint32_t integer;
 };
 
 static uint32_t
@@ -62,11 +62,11 @@ rpm_to_razor_flags(uint32_t flags)
 
 static void
 add_properties(struct razor_importer *importer,
-	       uint32_t type_flags,
-	       Header h, int_32 name_tag, int_32 version_tag, int_32 flags_tag)
+	       uint32_t type_flags, Header h,
+	       int32_t name_tag, int32_t version_tag, int32_t flags_tag)
 {
 	union rpm_entry names, versions, flags;
-	int_32 i, type, count;
+	int32_t i, type, count;
 
 	headerGetEntry(h, name_tag, &type, &names.p, &count);
 	headerGetEntry(h, version_tag, &type, &versions.p, &count);
@@ -85,7 +85,7 @@ razor_set_create_from_rpmdb(void)
 	struct razor_importer *importer;
 	rpmdbMatchIterator iter;
 	Header h;
-	int_32 type, count, i;
+	int32_t type, count, i;
 	union rpm_entry name, epoch, version, release, arch;
 	union rpm_entry summary, description, url, license;
 	union rpm_entry basenames, dirnames, dirindexes;