Do not use legacy BSD u_* types

Some systems do not have these types available, and they are simply
convenience aliases. Instead use the expanded versions which are more
portable.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=101192

diff --git a/include/bsd/netinet/ip_icmp.h b/include/bsd/netinet/ip_icmp.h
index 0742aa65bd9c774ce745a4a90d4d9041600355ef..45f5d72daeb2e6bd1cbd0087eb3d6a6a5d861e3b 100644 (file)
--- a/include/bsd/netinet/ip_icmp.h
+++ b/include/bsd/netinet/ip_icmp.h
@@ -33,7 +33,7 @@
 #ifndef _NETINET_IP_ICMP_H_
 #define _NETINET_IP_ICMP_H_
 
-#include <sys/types.h>         /* u_int32_t, u_char */
+#include <sys/types.h>         /* uint32_t */
 #include <netinet/in.h>                /* in_addr */
 #include <netinet/in_systm.h>  /* n_short */
 #include <netinet/ip.h>                /* idi_ip */
@@ -47,19 +47,19 @@
  * Internal of an ICMP Router Advertisement
  */
 struct icmp_ra_addr {
-       u_int32_t ira_addr;
-       u_int32_t ira_preference;
+       uint32_t ira_addr;
+       uint32_t ira_preference;
 };
 
 /*
  * Structure of an icmp header.
  */
 struct icmp {
-       u_char  icmp_type;              /* type of message, see below */
-       u_char  icmp_code;              /* type sub code */
-       u_short icmp_cksum;             /* ones complement cksum of struct */
+       unsigned char   icmp_type;      /* type of message, see below */
+       unsigned char   icmp_code;      /* type sub code */
+       unsigned short  icmp_cksum;     /* ones complement cksum of struct */
        union {
-               u_char ih_pptr;                 /* ICMP_PARAMPROB */
+               unsigned char ih_pptr;          /* ICMP_PARAMPROB */
                struct in_addr ih_gwaddr;       /* ICMP_REDIRECT */
                struct ih_idseq {
                        n_short icd_id;
@@ -74,9 +74,9 @@ struct icmp {
                } ih_pmtu;
 
                struct ih_rtradv {
-                       u_char irt_num_addrs;
-                       u_char irt_wpa;
-                       u_int16_t irt_lifetime;
+                       unsigned char irt_num_addrs;
+                       unsigned char irt_wpa;
+                       uint16_t irt_lifetime;
                } ih_rtradv;
        } icmp_hun;
 #define        icmp_pptr       icmp_hun.ih_pptr
@@ -100,7 +100,7 @@ struct icmp {
                        /* options and then 64 bits of data */
                } id_ip;
                struct icmp_ra_addr id_radv;
-               u_int32_t id_mask;
+               uint32_t id_mask;
                char    id_data[1];
        } icmp_dun;
 #define        icmp_otime      icmp_dun.id_ts.its_otime

diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
index 0604cad28d05241034402fd9a15b7ee2b732c5cb..46a009ecb92701ae3add3ca87e7a9e348287f97d 100644 (file)
--- a/include/bsd/stdlib.h
+++ b/include/bsd/stdlib.h
@@ -49,7 +49,7 @@
 __BEGIN_DECLS
 uint32_t arc4random(void);
 void arc4random_stir(void);
-void arc4random_addrandom(u_char *dat, int datlen);
+void arc4random_addrandom(unsigned char *dat, int datlen);
 void arc4random_buf(void *_buf, size_t n);
 uint32_t arc4random_uniform(uint32_t upper_bound);
 

diff --git a/src/arc4random.c b/src/arc4random.c
index fb167578be19e0f82b4bd39f26a789fac9f2c3f8..c6f89c378c2631b04182df4df2d41dc97bc9f562 100644 (file)
--- a/src/arc4random.c
+++ b/src/arc4random.c
@@ -59,7 +59,7 @@ static struct _rs {
 /* Maybe be preserved in fork children, if _rs_allocate() decides. */
 static struct _rsx {
        chacha_ctx      rs_chacha;      /* chacha context for random keystream */
-       u_char          rs_buf[RSBUFSZ];        /* keystream blocks */
+       unsigned char   rs_buf[RSBUFSZ];        /* keystream blocks */
 } *rsx;
 
 static inline int _rs_allocate(struct _rs **, struct _rsx **);
@@ -67,7 +67,7 @@ static inline void _rs_forkdetect(void);
 #include "arc4random.h"
 
 static inline void
-_rs_init(u_char *buf, size_t n)
+_rs_init(unsigned char *buf, size_t n)
 {
        if (n < KEYSZ + IVSZ)
                return;
@@ -82,7 +82,7 @@ _rs_init(u_char *buf, size_t n)
 }
 
 static inline void
-_rs_rekey(u_char *dat, size_t datlen)
+_rs_rekey(unsigned char *dat, size_t datlen)
 {
 #ifndef KEYSTREAM_ONLY
        memset(rsx->rs_buf, 0, sizeof(rsx->rs_buf));
@@ -107,7 +107,7 @@ _rs_rekey(u_char *dat, size_t datlen)
 static void
 _rs_stir(void)
 {
-       u_char rnd[KEYSZ + IVSZ];
+       unsigned char rnd[KEYSZ + IVSZ];
 
        if (getentropy(rnd, sizeof rnd) == -1)
                _getentropy_fail();
@@ -140,8 +140,8 @@ _rs_stir_if_needed(size_t len)
 static inline void
 _rs_random_buf(void *_buf, size_t n)
 {
-       u_char *buf = (u_char *)_buf;
-       u_char *keystream;
+       unsigned char *buf = (unsigned char *)_buf;
+       unsigned char *keystream;
        size_t m;
 
        _rs_stir_if_needed(n);
@@ -164,7 +164,7 @@ _rs_random_buf(void *_buf, size_t n)
 static inline void
 _rs_random_u32(uint32_t *val)
 {
-       u_char *keystream;
+       unsigned char *keystream;
 
        _rs_stir_if_needed(sizeof(*val));
        if (rs->rs_have < sizeof(*val))
@@ -184,7 +184,7 @@ arc4random_stir(void)
 }
 
 void
-arc4random_addrandom(u_char *dat, int datlen)
+arc4random_addrandom(unsigned char *dat, int datlen)
 {
        _ARC4_LOCK();
        _rs_stir_if_needed(datlen);

diff --git a/src/chacha_private.h b/src/chacha_private.h
index b720d93f169b6e85157200ca5aa23bf531b5f8fa..5aae8d86c63f0ce641f2ce3cb86a726f380fa9d4 100644 (file)
--- a/src/chacha_private.h
+++ b/src/chacha_private.h
@@ -92,7 +92,7 @@ chacha_encrypt_bytes(chacha_ctx *x,const u8 *m,u8 *c,u32 bytes)
   u32 j0, j1, j2, j3, j4, j5, j6, j7, j8, j9, j10, j11, j12, j13, j14, j15;
   u8 *ctarget = NULL;
   u8 tmp[64];
-  u_int i;
+  unsigned int i;
 
   if (!bytes) return;
 

diff --git a/src/getentropy_bsd.c b/src/getentropy_bsd.c
index 19599842d62652b317742e4aa10ff028301a9caa..d45901b99c4d05d0038aa954a763544f4987ebb4 100644 (file)
--- a/src/getentropy_bsd.c
+++ b/src/getentropy_bsd.c
@@ -30,7 +30,7 @@
  * Derived from lib/libc/gen/arc4random.c from FreeBSD.
  */
 static size_t
-getentropy_sysctl(u_char *buf, size_t size)
+getentropy_sysctl(unsigned char *buf, size_t size)
 {
        int mib[2];
        size_t len, done;

diff --git a/src/hash/helper.c b/src/hash/helper.c
index 1c63564f737b7e6d63c3b213a0bb516503c977b4..d9362d35c597e402be5e2ee38cec2bc68cb2008e 100644 (file)
--- a/src/hash/helper.c
+++ b/src/hash/helper.c
@@ -51,7 +51,7 @@ char *
 HASHFileChunk(const char *filename, char *buf, off_t off, off_t len)
 {
        struct stat sb;
-       u_char buffer[BUFSIZ];
+       unsigned char buffer[BUFSIZ];
        HASH_CTX ctx;
        int fd, save_errno;
        ssize_t nr;
@@ -92,7 +92,7 @@ HASHFile(const char *filename, char *buf)
 }
 
 char *
-HASHData(const u_char *data, size_t len, char *buf)
+HASHData(const unsigned char *data, size_t len, char *buf)
 {
        HASH_CTX ctx;
 

diff --git a/src/inet_net_pton.c b/src/inet_net_pton.c
index 28c55bafb83a709f26ac1bd8d223efa24145e29f..b0147f6e5e36a392316f1f1c1edc64a8abd93ec6 100644 (file)
--- a/src/inet_net_pton.c
+++ b/src/inet_net_pton.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD: src/lib/libc/net/inet_net_pton.c,v 1.9 2003/09/15 23:38:06 f
 # define SPRINTF(x) ((size_t)sprintf x)
 #endif
 
-static int     inet_net_pton_ipv4(const char *src, u_char *dst, size_t size);
+static int     inet_net_pton_ipv4(const char *src, unsigned char *dst, size_t size);
 
 /*
  * static int
@@ -83,13 +83,13 @@ inet_net_pton(int af, const char *src, void *dst, size_t size)
  *     Paul Vixie (ISC), June 1996
  */
 static int
-inet_net_pton_ipv4(const char *src, u_char *dst, size_t size)
+inet_net_pton_ipv4(const char *src, unsigned char *dst, size_t size)
 {
        static const char
                xdigits[] = "0123456789abcdef",
                digits[] = "0123456789";
        int n, ch, tmp, dirty, bits;
-       const u_char *odst = dst;
+       const unsigned char *odst = dst;
 
        ch = *src++;
        if (ch == '0' && (src[0] == 'x' || src[0] == 'X')
@@ -130,7 +130,7 @@ inet_net_pton_ipv4(const char *src, u_char *dst, size_t size)
                                 isascii(ch) && isdigit(ch));
                        if (size-- <= 0)
                                goto emsgsize;
-                       *dst++ = (u_char) tmp;
+                       *dst++ = (unsigned char) tmp;
                        if (ch == '\0' || ch == '/')
                                break;
                        if (ch != '.')

diff --git a/src/merge.c b/src/merge.c
index c82594cfd671b037ad3f9811dc1a17ccd48556c6..dc92b448daa971bded536fd59eddf3e5f8cd3da9 100644 (file)
--- a/src/merge.c
+++ b/src/merge.c
@@ -56,13 +56,13 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <string.h>
 
-static void setup(u_char *, u_char *, size_t, size_t,
+static void setup(unsigned char *, unsigned char *, size_t, size_t,
     int (*)(const void *, const void *));
-static void insertionsort(u_char *, size_t, size_t,
+static void insertionsort(unsigned char *, size_t, size_t,
     int (*)(const void *, const void *));
 
 #define ISIZE sizeof(int)
-#define PSIZE sizeof(u_char *)
+#define PSIZE sizeof(unsigned char *)
 #define ICOPY_LIST(src, dst, last)                             \
        do                                                      \
        *(int*)dst = *(int*)src, src += ISIZE, dst += ISIZE;    \
@@ -87,9 +87,10 @@ static void insertionsort(u_char *, size_t, size_t,
  * boundaries.
  */
 /* Assumption: PSIZE is a power of 2. */
-#define EVAL(p) (u_char **)                                            \
-       ((u_char *)0 +                                                  \
-           (((u_char *)p + PSIZE - 1 - (u_char *) 0) & ~(PSIZE - 1)))
+#define EVAL(p) (unsigned char **)                                     \
+       ((unsigned char *)0 +                                           \
+        (((unsigned char *)p + PSIZE - 1 -                             \
+          (unsigned char *)0) & ~(PSIZE - 1)))
 
 /*
  * Arguments are as for qsort.
@@ -101,8 +102,8 @@ mergesort(void *base, size_t nmemb, size_t size,
        size_t i;
        int sense;
        int big, iflag;
-       u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2;
-       u_char *list2, *list1, *p2, *p, *last, **p1;
+       unsigned char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2;
+       unsigned char *list2, *list1, *p2, *p, *last, **p1;
 
        if (size < PSIZE / 2) {         /* Pointers must fit into 2 * size. */
                errno = EINVAL;
@@ -256,16 +257,16 @@ COPY:                             b = t;
  * is defined.  Otherwise simple pairwise merging is used.)
  */
 static void
-setup(u_char *list1, u_char *list2, size_t n, size_t size,
+setup(unsigned char *list1, unsigned char *list2, size_t n, size_t size,
        int (*cmp)(const void *, const void *))
 {
        int i, length, size2, tmp, sense;
-       u_char *f1, *f2, *s, *l2, *last, *p2;
+       unsigned char *f1, *f2, *s, *l2, *last, *p2;
 
        size2 = size*2;
        if (n <= 5) {
                insertionsort(list1, n, size, cmp);
-               *EVAL(list2) = (u_char*) list2 + n*size;
+               *EVAL(list2) = (unsigned char*) list2 + n*size;
                return;
        }
        /*
@@ -328,10 +329,10 @@ setup(u_char *list1, u_char *list2, size_t n, size_t size,
  * last 4 elements.
  */
 static void
-insertionsort(u_char *a, size_t n, size_t size,
+insertionsort(unsigned char *a, size_t n, size_t size,
        int (*cmp)(const void *, const void *))
 {
-       u_char *ai, *s, *t, *u, tmp;
+       unsigned char *ai, *s, *t, *u, tmp;
        int i;
 
        for (ai = a+size; --n >= 1; ai += size)

diff --git a/src/nlist.c b/src/nlist.c
index 0cffe55f7a27b91efa755b70267cec287f4205b4..a0669358221ba17fb6eba8ded0b78cd446219b34 100644 (file)
--- a/src/nlist.c
+++ b/src/nlist.c
@@ -117,7 +117,7 @@ __aout_fdnlist(int fd, struct nlist *list)
        struct nlist *p, *symtab;
        caddr_t strtab, a_out_mmap;
        off_t stroff, symoff;
-       u_long symsize;
+       unsigned long symsize;
        int nent;
        struct exec * exec;
        struct stat st;

diff --git a/src/radixsort.c b/src/radixsort.c
index ad2ae70f28bf617948f619eb71b79a35a91e02c3..77ae52ca83e9aa55f0a486aa0aa9ddda897557f3 100644 (file)
--- a/src/radixsort.c
+++ b/src/radixsort.c
@@ -59,14 +59,14 @@ __RCSID("$NetBSD: radixsort.c,v 1.18 2009/08/21 20:49:50 dsl Exp $");
 #include <errno.h>
 
 typedef struct {
-       const u_char **sa;
+       const unsigned char **sa;
        int sn, si;
 } stack;
 
-static inline void simplesort(const u_char **, int, int, const u_char *, u_int);
-static void r_sort_a(const u_char **, int, int, const u_char *, u_int);
-static void r_sort_b(const u_char **,
-           const u_char **, int, int, const u_char *, u_int);
+static inline void simplesort(const unsigned char **, int, int, const unsigned char *, unsigned int);
+static void r_sort_a(const unsigned char **, int, int, const unsigned char *, unsigned int);
+static void r_sort_b(const unsigned char **,
+           const unsigned char **, int, int, const unsigned char *, unsigned int);
 
 #define        THRESHOLD       20              /* Divert to simplesort(). */
 #define        SIZE            512             /* Default stack size. */
@@ -91,11 +91,12 @@ static void r_sort_b(const u_char **,
 }
 
 int
-radixsort(const u_char **a, int n, const u_char *tab, u_int endch)
+radixsort(const unsigned char **a, int n, const unsigned char *tab,
+          unsigned int endch)
 {
-       const u_char *tr;
-       u_int c;
-       u_char tr0[256];
+       const unsigned char *tr;
+       unsigned int c;
+       unsigned char tr0[256];
 
        SETUP;
        r_sort_a(a, n, 0, tr, endch);
@@ -103,11 +104,12 @@ radixsort(const u_char **a, int n, const u_char *tab, u_int endch)
 }
 
 int
-sradixsort(const u_char **a, int n, const u_char *tab, u_int endch)
+sradixsort(const unsigned char **a, int n, const unsigned char *tab,
+           unsigned int endch)
 {
-       const u_char *tr, **ta;
-       u_int c;
-       u_char tr0[256];
+       const unsigned char *tr, **ta;
+       unsigned int c;
+       unsigned char tr0[256];
 
        if (a == NULL) {
                errno = EFAULT;
@@ -134,14 +136,15 @@ sradixsort(const u_char **a, int n, const u_char *tab, u_int endch)
 
 /* Unstable, in-place sort. */
 static void
-r_sort_a(const u_char **a, int n, int i, const u_char *tr, u_int endch)
+r_sort_a(const unsigned char **a, int n, int i, const unsigned char *tr,
+         unsigned int endch)
 {
-       static u_int count[256], nc, bmin;
-       u_int c;
-       const u_char **ak, *r;
+       static unsigned int count[256], nc, bmin;
+       unsigned int c;
+       const unsigned char **ak, *r;
        stack s[SIZE], *sp, *sp0, *sp1, temp;
-       u_int *cp, bigc;
-       const u_char **an, *t, **aj, **top[256];
+       unsigned int *cp, bigc;
+       const unsigned char **an, *t, **aj, **top[256];
 
        /* Set up stack. */
        sp = s;
@@ -176,7 +179,7 @@ r_sort_a(const u_char **a, int n, int i, const u_char *tr, u_int endch)
                 * character at position i, move on to the next
                 * character.
                 */
-               if (nc == 1 && count[bmin] == (u_int)n) {
+               if (nc == 1 && count[bmin] == (unsigned int)n) {
                        push(a, n, i+1);
                        nc = count[bmin] = 0;
                        continue;
@@ -232,15 +235,15 @@ r_sort_a(const u_char **a, int n, int i, const u_char *tr, u_int endch)
 
 /* Stable sort, requiring additional memory. */
 static void
-r_sort_b(const u_char **a, const u_char **ta, int n, int i, const u_char *tr,
-    u_int endch)
+r_sort_b(const unsigned char **a, const unsigned char **ta, int n, int i,
+         const unsigned char *tr, unsigned int endch)
 {
-       static u_int count[256], nc, bmin;
-       u_int c;
-       const u_char **ak, **ai;
+       static unsigned int count[256], nc, bmin;
+       unsigned int c;
+       const unsigned char **ak, **ai;
        stack s[512], *sp, *sp0, *sp1, temp;
-       const u_char **top[256];
-       u_int *cp, bigc;
+       const unsigned char **top[256];
+       unsigned int *cp, bigc;
 
        sp = s;
        push(a, n, i);
@@ -302,10 +305,11 @@ r_sort_b(const u_char **a, const u_char **ta, int n, int i, const u_char *tr,
 
 /* insertion sort */
 static inline void
-simplesort(const u_char **a, int n, int b, const u_char *tr, u_int endch)
+simplesort(const unsigned char **a, int n, int b, const unsigned char *tr,
+           unsigned int endch)
 {
-       u_char ch;
-       const u_char  **ak, **ai, *s, *t;
+       unsigned char ch;
+       const unsigned char  **ak, **ai, *s, *t;
 
        for (ak = a+1; --n >= 1; ak++)
                for (ai = ak; ai > a; ai--) {

diff --git a/src/unvis.c b/src/unvis.c
index 53da64b39e5938bfdbc20bb317f79632d264bbf9..c45a5f884a6d13dc2f7787f1734665e31112c31c 100644 (file)
--- a/src/unvis.c
+++ b/src/unvis.c
@@ -45,8 +45,11 @@
 
 #define        S_HTTP          0x080   /* %HEXHEX escape */
 
-#define        isoctal(c)      (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
-#define        ishex(c)        ((((u_char)(c)) >= '0' && ((u_char)(c)) <= '9') || (((u_char)(c)) >= 'a' && ((u_char)(c)) <= 'f'))
+#define        isoctal(c) \
+       (((unsigned char)(c)) >= '0' && ((unsigned char)(c)) <= '7')
+#define        ishex(c) \
+       ((((unsigned char)(c)) >= '0' && ((unsigned char)(c)) <= '9') || \
+        (((unsigned char)(c)) >= 'a' && ((unsigned char)(c)) <= 'f'))
 
 /*
  * unvis - decode characters previously encoded by vis

diff --git a/src/vis.c b/src/vis.c
index f869ed814001b81d2a4fbf65dbc7f1d61c5e54ae..c9a06e8c862f999bc1aba01a2ebdb01ebea6789c 100644 (file)
--- a/src/vis.c
+++ b/src/vis.c
@@ -35,17 +35,20 @@
 #include <stdio.h>
 #include <vis.h>
 
-#define        isoctal(c)      (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
+#define        isoctal(c)      \
+       (((unsigned char)(c)) >= '0' && ((unsigned char)(c)) <= '7')
 #define        isvisible(c)                                                    \
-       (((u_int)(c) <= UCHAR_MAX && isascii((u_char)(c)) &&            \
+       (((unsigned int)(c) <= UCHAR_MAX &&                             \
+         isascii((unsigned char)(c)) &&                                \
        (((c) != '*' && (c) != '?' && (c) != '[' && (c) != '#') ||      \
-               (flag & VIS_GLOB) == 0) && isgraph((u_char)(c))) ||     \
+               (flag & VIS_GLOB) == 0) &&                              \
+         isgraph((unsigned char)(c))) ||                               \
        ((flag & VIS_SP) == 0 && (c) == ' ') ||                         \
        ((flag & VIS_TAB) == 0 && (c) == '\t') ||                       \
        ((flag & VIS_NL) == 0 && (c) == '\n') ||                        \
        ((flag & VIS_SAFE) && ((c) == '\b' ||                           \
                (c) == '\007' || (c) == '\r' ||                         \
-               isgraph((u_char)(c)))))
+               isgraph((unsigned char)(c)))))
 
 /*
  * vis - visually encode characters
@@ -131,9 +134,9 @@ vis(char *dst, int c, int flag, int nextc)
        }
        if (((c & 0177) == ' ') || isgraph(c) || (flag & VIS_OCTAL)) {
                *dst++ = '\\';
-               *dst++ = ((u_char)c >> 6 & 07) + '0';
-               *dst++ = ((u_char)c >> 3 & 07) + '0';
-               *dst++ = ((u_char)c & 07) + '0';
+               *dst++ = ((unsigned char)c >> 6 & 07) + '0';
+               *dst++ = ((unsigned char)c >> 3 & 07) + '0';
+               *dst++ = ((unsigned char)c & 07) + '0';
                goto done;
        }
        if ((flag & VIS_NOSLASH) == 0)