From: Brad King <brad.king@kitware.com>
Date: Mon, 5 Apr 2021 14:10:48 +0000 (-0400)
Subject: Use uint8_t instead of u_char
X-Git-Tag: v3.5.2~24^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4e76bdf94c4c3a6fb0d61c7c1fef41e8b35e451;p=thirdparty%2Flibarchive.git

Use uint8_t instead of u_char

The latter is not a standard type.
---

diff --git a/libarchive/archive_random.c b/libarchive/archive_random.c
index 65ea69157..9d1aa493f 100644
--- a/libarchive/archive_random.c
+++ b/libarchive/archive_random.c
@@ -173,7 +173,7 @@ arc4_init(void)
 }
 
 static inline void
-arc4_addrandom(u_char *dat, int datlen)
+arc4_addrandom(uint8_t *dat, int datlen)
 {
 	int     n;
 	uint8_t si;
@@ -196,7 +196,7 @@ arc4_stir(void)
 	struct {
 		struct timeval	tv;
 		pid_t		pid;
-		u_char	 	rnd[KEYSIZE];
+		uint8_t		rnd[KEYSIZE];
 	} rdat;
 
 	if (!rs_initialized) {
@@ -216,7 +216,7 @@ arc4_stir(void)
 		/* We'll just take whatever was on the stack too... */
 	}
 
-	arc4_addrandom((u_char *)&rdat, KEYSIZE);
+	arc4_addrandom((uint8_t *)&rdat, KEYSIZE);
 
 	/*
 	 * Discard early keystream, as per recommendations in:
@@ -258,7 +258,7 @@ arc4_getbyte(void)
 static void
 arc4random_buf(void *_buf, size_t n)
 {
-	u_char *buf = (u_char *)_buf;
+	uint8_t *buf = (uint8_t *)_buf;
 	_ARC4_LOCK();
 	arc4_stir_if_needed();
 	while (n--) {