Eliminate [u|]int_[8|16|32]. Use c99 stdint.h types instead.

7 files changed, 35 insertions, 35 deletions

diff --git a/build/files.c b/build/files.c
index 584eb34ad..f9664a1d3 100644
--- a/build/files.c
+++ b/build/files.c
@@ -1129,8 +1129,8 @@ static void genCpioListAndHeader(FileList fl,
 	(void) headerAddOrAppendEntry(h, RPMTAG_OLDFILENAMES, RPM_STRING_ARRAY_TYPE,
 			       &(flp->fileURL), 1);
 
-      if (sizeof(flp->fl_size) != sizeof(uint_32)) {
-	uint_32 psize = (uint_32)flp->fl_size;
+      if (sizeof(flp->fl_size) != sizeof(uint32_t)) {
+	uint32_t psize = (uint32_t)flp->fl_size;
 	(void) headerAddOrAppendEntry(h, RPMTAG_FILESIZES, RPM_INT32_TYPE,
 			       &(psize), 1);
       } else {
@@ -1141,40 +1141,40 @@ static void genCpioListAndHeader(FileList fl,
 			       &(flp->uname), 1);
 	(void) headerAddOrAppendEntry(h, RPMTAG_FILEGROUPNAME, RPM_STRING_ARRAY_TYPE,
 			       &(flp->gname), 1);
-      if (sizeof(flp->fl_mtime) != sizeof(uint_32)) {
-	uint_32 mtime = (uint_32)flp->fl_mtime;
+      if (sizeof(flp->fl_mtime) != sizeof(uint32_t)) {
+	uint32_t mtime = (uint32_t)flp->fl_mtime;
 	(void) headerAddOrAppendEntry(h, RPMTAG_FILEMTIMES, RPM_INT32_TYPE,
 			       &(mtime), 1);
       } else {
 	(void) headerAddOrAppendEntry(h, RPMTAG_FILEMTIMES, RPM_INT32_TYPE,
 			       &(flp->fl_mtime), 1);
       }
-      if (sizeof(flp->fl_mode) != sizeof(uint_16)) {
-	uint_16 pmode = (uint_16)flp->fl_mode;
+      if (sizeof(flp->fl_mode) != sizeof(uint16_t)) {
+	uint16_t pmode = (uint16_t)flp->fl_mode;
 	(void) headerAddOrAppendEntry(h, RPMTAG_FILEMODES, RPM_INT16_TYPE,
 			       &(pmode), 1);
       } else {
 	(void) headerAddOrAppendEntry(h, RPMTAG_FILEMODES, RPM_INT16_TYPE,
 			       &(flp->fl_mode), 1);
       }
-      if (sizeof(flp->fl_rdev) != sizeof(uint_16)) {
-	uint_16 prdev = (uint_16)flp->fl_rdev;
+      if (sizeof(flp->fl_rdev) != sizeof(uint16_t)) {
+	uint16_t prdev = (uint16_t)flp->fl_rdev;
 	(void) headerAddOrAppendEntry(h, RPMTAG_FILERDEVS, RPM_INT16_TYPE,
 			       &(prdev), 1);
       } else {
 	(void) headerAddOrAppendEntry(h, RPMTAG_FILERDEVS, RPM_INT16_TYPE,
 			       &(flp->fl_rdev), 1);
       }
-      if (sizeof(flp->fl_dev) != sizeof(uint_32)) {
-	uint_32 pdevice = (uint_32)flp->fl_dev;
+      if (sizeof(flp->fl_dev) != sizeof(uint32_t)) {
+	uint32_t pdevice = (uint32_t)flp->fl_dev;
 	(void) headerAddOrAppendEntry(h, RPMTAG_FILEDEVICES, RPM_INT32_TYPE,
 			       &(pdevice), 1);
       } else {
 	(void) headerAddOrAppendEntry(h, RPMTAG_FILEDEVICES, RPM_INT32_TYPE,
 			       &(flp->fl_dev), 1);
       }
-      if (sizeof(flp->fl_ino) != sizeof(uint_32)) {
-	uint_32 ino = (uint_32)flp->fl_ino;
+      if (sizeof(flp->fl_ino) != sizeof(uint32_t)) {
+	uint32_t ino = (uint32_t)flp->fl_ino;
 	(void) headerAddOrAppendEntry(h, RPMTAG_FILEINODES, RPM_INT32_TYPE,
 				&(ino), 1);
       } else {
@@ -2014,7 +2014,7 @@ exit:
 void initSourceHeader(rpmSpec spec)
 {
     HeaderIterator hi;
-    int_32 tag, type, count;
+    int32_t tag, type, count;
     const void * ptr;
 
     spec->sourceHeader = headerNew();
diff --git a/build/names.c b/build/names.c
index bd3a5e66a..3a3c1b7d7 100644
--- a/build/names.c
+++ b/build/names.c
@@ -172,12 +172,12 @@ gid_t getGidS(const char *gname)
     return gids[gid_used++];
 }
 
-int_32 * getBuildTime(void)
+int32_t * getBuildTime(void)
 {
-    static int_32 buildTime[1];
+    static int32_t buildTime[1];
 
     if (buildTime[0] == 0)
-	buildTime[0] = (int_32) time(NULL);
+	buildTime[0] = (int32_t) time(NULL);
     return buildTime;
 }
 
diff --git a/build/pack.c b/build/pack.c
index e1a334972..e973d038b 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -385,7 +385,7 @@ int writeRPM(Header *hdrp, unsigned char ** pkgidp, const char *fileName,
 {
     FD_t fd = NULL;
     FD_t ifd = NULL;
-    int_32 count, sigtag;
+    int32_t count, sigtag;
     const char * sigtarget;
     const char * rpmio_flags = NULL;
     const char * SHA1 = NULL;
@@ -506,7 +506,7 @@ int writeRPM(Header *hdrp, unsigned char ** pkgidp, const char *fileName,
      */
     if (Fileno(csa->cpioFdIn) < 0) {
 	HGE_t hge = (HGE_t)headerGetEntryMinMemory;
-	int_32 * archiveSize;
+	int32_t * archiveSize;
 	if (hge(h, RPMTAG_ARCHIVESIZE, NULL, (void *)&archiveSize, NULL))
 	    *archiveSize = csa->cpioArchiveSize;
     }
@@ -550,7 +550,7 @@ int writeRPM(Header *hdrp, unsigned char ** pkgidp, const char *fileName,
 	SHA1 = _free(SHA1);
     }
 
-    {	int_32 payloadSize = csa->cpioArchiveSize;
+    {	int32_t payloadSize = csa->cpioArchiveSize;
 	(void) headerAddEntry(sig, RPMSIGTAG_PAYLOADSIZE, RPM_INT32_TYPE,
 			&payloadSize, 1);
     }
@@ -672,9 +672,9 @@ exit:
 
     /* XXX Fish the pkgid out of the signature header. */
     if (sig != NULL && pkgidp != NULL) {
-	int_32 tagType;
+	int32_t tagType;
 	unsigned char * MD5 = NULL;
-	int_32 c;
+	int32_t c;
 	int xx;
 	xx = headerGetEntry(sig, RPMSIGTAG_MD5, &tagType, (void **)&MD5, &c);
 	if (tagType == RPM_BIN_TYPE && MD5 != NULL && c == 16)
@@ -703,7 +703,7 @@ exit:
     return rc;
 }
 
-static int_32 copyTags[] = {
+static int32_t copyTags[] = {
     RPMTAG_CHANGELOGTIME,
     RPMTAG_CHANGELOGNAME,
     RPMTAG_CHANGELOGTEXT,
diff --git a/build/parseChangelog.c b/build/parseChangelog.c
index 4b95bc68a..8bfb3e987 100644
--- a/build/parseChangelog.c
+++ b/build/parseChangelog.c
@@ -11,7 +11,7 @@
 
 void addChangelogEntry(Header h, time_t time, const char *name, const char *text)
 {
-    int_32 mytime = time;	/* XXX convert to header representation */
+    int32_t mytime = time;	/* XXX convert to header representation */
     if (headerIsEntry(h, RPMTAG_CHANGELOGTIME)) {
 	(void) headerAppendEntry(h, RPMTAG_CHANGELOGTIME, RPM_INT32_TYPE,
 			  &mytime, 1);
diff --git a/build/parsePreamble.c b/build/parsePreamble.c
index 220b8e986..61d62ee90 100644
--- a/build/parsePreamble.c
+++ b/build/parsePreamble.c
@@ -47,7 +47,7 @@ static rpmTag requiredTags[] = {
 
 /**
  */
-static void addOrAppendListEntry(Header h, int_32 tag, char * line)
+static void addOrAppendListEntry(Header h, int32_t tag, char * line)
 {
     int xx;
     int argc;
@@ -890,7 +890,7 @@ int parsePreamble(rpmSpec spec, int initialPackage)
 
     if (pkg != spec->packages)
 	headerCopyTags(spec->packages->header, pkg->header,
-			(int_32 *)copyTagsDuringParse);
+			(int32_t *)copyTagsDuringParse);
 
     if (checkForRequired(pkg->header, NVR))
 	return RPMERR_BADSPEC;
diff --git a/build/rpmbuild.h b/build/rpmbuild.h
index 1ac7119c1..e6dbcd645 100644
--- a/build/rpmbuild.h
+++ b/build/rpmbuild.h
@@ -140,7 +140,7 @@ extern const char * buildHost(void)	;
  * Return build time stamp.
  * @return		build time stamp
  */
-extern int_32 * getBuildTime(void)	;
+extern int32_t * getBuildTime(void)	;
 
 /** \ingroup rpmbuild
  * Read next line from spec file.
diff --git a/build/rpmfc.c b/build/rpmfc.c
index 9304e9c9b..be6c0ec94 100644
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -295,7 +295,7 @@ static int rpmfcSaveArg(ARGV_t * argvp, const char * key)
 static char * rpmfcFileDep(char * buf, int ix,
 		rpmds ds)
 {
-    int_32 tagN = rpmdsTagN(ds);
+    int32_t tagN = rpmdsTagN(ds);
     char deptype = 'X';
 
     buf[0] = '\0';
@@ -330,7 +330,7 @@ static int rpmfcHelper(rpmfc fc, unsigned char deptype, const char * nsdep)
     rpmds * depsp, ds;
     const char * N;
     const char * EVR;
-    int_32 Flags, dsContext, tagN;
+    int32_t Flags, dsContext, tagN;
     ARGV_t pav;
     const char * s;
     int pac;
@@ -798,7 +798,7 @@ static int rpmfcELF(rpmfc fc)
     struct stat sb, * st = &sb;
     const char * soname = NULL;
     rpmds * depsp, ds;
-    int_32 tagN, dsContext;
+    int32_t tagN, dsContext;
     char * t;
     int xx;
     int isElf64;
@@ -1115,7 +1115,7 @@ int rpmfcApply(rpmfc fc)
     rpmds ds;
     const char * N;
     const char * EVR;
-    int_32 Flags;
+    int32_t Flags;
     unsigned char deptype;
     int nddict;
     int previx;
@@ -1207,7 +1207,7 @@ assert(dix >= 0);
     return 0;
 }
 
-int rpmfcClassify(rpmfc fc, ARGV_t argv, int_16 * fmode)
+int rpmfcClassify(rpmfc fc, ARGV_t argv, int16_t * fmode)
 {
     ARGV_t fcav = NULL;
     ARGV_t dav;
@@ -1248,7 +1248,7 @@ assert(xx != -1);	/* XXX figger a proper return path. */
 
     for (fc->ix = 0; fc->ix < fc->nfiles; fc->ix++) {
 	const char * ftype;
-	int_16 mode = (fmode ? fmode[fc->ix] : 0);
+	int16_t mode = (fmode ? fmode[fc->ix] : 0);
 
 	s = argv[fc->ix];
 assert(s != NULL);
@@ -1407,7 +1407,7 @@ static void printDeps(Header h)
     rpmds ds = NULL;
     int flags = 0;	/* XXX !scareMem */
     const char * DNEVR;
-    int_32 Flags;
+    int32_t Flags;
     int bingo = 0;
 
     for (dm = DepMsgs; dm->msg != NULL; dm++) {
@@ -1526,7 +1526,7 @@ int rpmfcGenerateDepends(const rpmSpec spec, Package pkg)
     rpmds ds;
     int flags = 0;	/* XXX !scareMem */
     ARGV_t av;
-    int_16 * fmode;
+    int16_t * fmode;
     int ac = rpmfiFC(fi);
     const void ** p;
     char buf[BUFSIZ];
@@ -1634,7 +1634,7 @@ assert(EVR != NULL);
     c = argiCount(fc->fcolor);
 assert(ac == c);
     if (p != NULL && c > 0) {
-	int_32 * fcolors = (int_32 *)p;
+	int32_t * fcolors = (int32_t *)p;
 	int i;
 
 	/* XXX Make sure only primary (i.e. Elf32/Elf64) colors are added. */