Move away from BSD data types

diff --git a/libathemecore/arc4random.c b/libathemecore/arc4random.c
index e8e05411bf02d839f4234aa7cd396278293afa7d..fc505679f26fb43fb335f3dc610dc5f7e57d2dd4 100644 (file)
--- a/libathemecore/arc4random.c
+++ b/libathemecore/arc4random.c
@@ -64,14 +64,14 @@
 static int rs_initialized;
 static pid_t rs_stir_pid;
 static chacha_ctx rs;          /* chacha context for random keystream */
-static u_char rs_buf[RSBUFSZ]; /* keystream blocks */
+static unsigned char rs_buf[RSBUFSZ];  /* keystream blocks */
 static size_t rs_have;         /* valid bytes at end of rs_buf */
 static size_t rs_count;                /* bytes till reseed */
 
-static inline void _rs_rekey(u_char *dat, size_t datlen);
+static inline void _rs_rekey(unsigned char *dat, size_t datlen);
 
 static inline void
-_rs_init(u_char *buf, size_t n)
+_rs_init(unsigned char *buf, size_t n)
 {
        if (n < KEYSZ + IVSZ)
                return;
@@ -83,7 +83,7 @@ _rs_init(u_char *buf, size_t n)
 #define SSH_RANDOM_DEV "/dev/urandom"
 /* XXX use getrandom() if supported on Linux */
 static void
-getrnd(u_char *s, size_t len)
+getrnd(unsigned char *s, size_t len)
 {
        int fd;
        ssize_t r;
@@ -108,7 +108,7 @@ getrnd(u_char *s, size_t len)
 static void
 _rs_stir(void)
 {
-       u_char rnd[KEYSZ + IVSZ];
+       unsigned char rnd[KEYSZ + IVSZ];
 
 #ifdef WITH_OPENSSL
        if (RAND_bytes(rnd, sizeof(rnd)) <= 0)
@@ -145,7 +145,7 @@ _rs_stir_if_needed(size_t len)
 }
 
 static inline void
-_rs_rekey(u_char *dat, size_t datlen)
+_rs_rekey(unsigned char *dat, size_t datlen)
 {
 #ifndef KEYSTREAM_ONLY
        memset(rs_buf, 0,RSBUFSZ);
@@ -169,7 +169,7 @@ _rs_rekey(u_char *dat, size_t datlen)
 static inline void
 _rs_random_buf(void *_buf, size_t n)
 {
-       u_char *buf = (u_char *)_buf;
+       unsigned char *buf = (unsigned char *)_buf;
        size_t m;
 
        _rs_stir_if_needed(n);
@@ -188,7 +188,7 @@ _rs_random_buf(void *_buf, size_t n)
 }
 
 static inline void
-_rs_random_u32(u_int32_t *val)
+_rs_random_u32(uint32_t *val)
 {
        _rs_stir_if_needed(sizeof(*val));
        if (rs_have < sizeof(*val))
@@ -208,7 +208,7 @@ arc4random_stir(void)
 }
 
 void
-arc4random_addrandom(u_char *dat, int datlen)
+arc4random_addrandom(unsigned char *dat, int datlen)
 {
        int m;
 
@@ -224,10 +224,10 @@ arc4random_addrandom(u_char *dat, int datlen)
        _ARC4_UNLOCK();
 }
 
-u_int32_t
+uint32_t
 arc4random(void)
 {
-       u_int32_t val;
+       uint32_t val;
 
        _ARC4_LOCK();
        _rs_random_u32(&val);
@@ -236,7 +236,7 @@ arc4random(void)
 }
 
 /*
- * If we are providing arc4random, then we can provide a more efficient 
+ * If we are providing arc4random, then we can provide a more efficient
  * arc4random_buf().
  */
 # ifndef HAVE_ARC4RANDOM_BUF
@@ -256,7 +256,7 @@ void
 arc4random_buf(void *_buf, size_t n)
 {
        size_t i;
-       u_int32_t r = 0;
+       uint32_t r = 0;
        char *buf = (char *)_buf;
 
        for (i = 0; i < n; i++) {
@@ -280,10 +280,10 @@ arc4random_buf(void *_buf, size_t n)
  * [2**32 % upper_bound, 2**32) which maps back to [0, upper_bound)
  * after reduction modulo upper_bound.
  */
-u_int32_t
-arc4random_uniform(u_int32_t upper_bound)
+uint32_t
+arc4random_uniform(uint32_t upper_bound)
 {
-       u_int32_t r, min;
+       uint32_t r, min;
 
        if (upper_bound < 2)
                return 0;

diff --git a/libathemecore/chacha_private.h b/libathemecore/chacha_private.h
index 7c3680fa6d64f1815d48f078c60243f076b3c27a..3b4ec9316d54762020134472da241dd303305cf4 100644 (file)
--- a/libathemecore/chacha_private.h
+++ b/libathemecore/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/libathemecore/cidr.c b/libathemecore/cidr.c
index b7c4001737dc495d9ef84b6e4fb212df960ab93b..41e7723e92f02eb6a651476ef6be542b6c59a338 100644 (file)
--- a/libathemecore/cidr.c
+++ b/libathemecore/cidr.c
@@ -42,13 +42,13 @@
 /* compares the first 'mask' bits
  * returns 1 if equal, 0 if not */
 static int
-comp_with_mask(void *addr, void *dest, u_int mask)
+comp_with_mask(void *addr, void *dest, unsigned int mask)
 {
        if (memcmp(addr, dest, mask / 8) == 0)
        {
                int n = mask / 8;
                int m = ((-1) << (8 - (mask % 8)));
-               if (mask % 8 == 0 || (((u_char *) addr)[n] & m) == (((u_char *) dest)[n] & m))
+               if (mask % 8 == 0 || (((unsigned char *) addr)[n] & m) == (((unsigned char *) dest)[n] & m))
                {
                        return (1);
                }
@@ -90,10 +90,10 @@ comp_with_mask(void *addr, void *dest, u_int mask)
  *     Paul Vixie, 1996.
  */
 static int
-inet_pton4(const char *src, u_char *dst)
+inet_pton4(const char *src, unsigned char *dst)
 {
        int saw_digit, octets, ch;
-       u_char tmp[INADDRSZ], *tp;
+       unsigned char tmp[INADDRSZ], *tp;
 
        saw_digit = 0;
        octets = 0;
@@ -103,7 +103,7 @@ inet_pton4(const char *src, u_char *dst)
 
                if(ch >= '0' && ch <= '9')
                {
-                       u_int new = *tp * 10 + (ch - '0');
+                       unsigned int new = *tp * 10 + (ch - '0');
 
                        if(new > 255)
                                return (0);
@@ -145,13 +145,13 @@ inet_pton4(const char *src, u_char *dst)
  *     Paul Vixie, 1996.
  */
 static int
-inet_pton6(const char *src, u_char *dst)
+inet_pton6(const char *src, unsigned char *dst)
 {
        static const char xdigits[] = "0123456789abcdef";
-       u_char tmp[IN6ADDRSZ], *tp, *endp, *colonp;
+       unsigned char tmp[IN6ADDRSZ], *tp, *endp, *colonp;
        const char *curtok;
        int ch, saw_xdigit;
-       u_int val;
+       unsigned int val;
 
        tp = memset(tmp, '\0', IN6ADDRSZ);
        endp = tp + IN6ADDRSZ;
@@ -193,8 +193,8 @@ inet_pton6(const char *src, u_char *dst)
                        }
                        if(tp + INT16SZ > endp)
                                return (0);
-                       *tp++ = (u_char) (val >> 8) & 0xff;
-                       *tp++ = (u_char) val & 0xff;
+                       *tp++ = (unsigned char) (val >> 8) & 0xff;
+                       *tp++ = (unsigned char) val & 0xff;
                        saw_xdigit = 0;
                        val = 0;
                        continue;
@@ -214,8 +214,8 @@ inet_pton6(const char *src, u_char *dst)
        {
                if(tp + INT16SZ > endp)
                        return (0);
-               *tp++ = (u_char) (val >> 8) & 0xff;
-               *tp++ = (u_char) val & 0xff;
+               *tp++ = (unsigned char) (val >> 8) & 0xff;
+               *tp++ = (unsigned char) val & 0xff;
        }
        if(colonp != NULL)
        {
@@ -369,7 +369,7 @@ match_cidr(const char *s1, const char *s2)
 int valid_ip_or_mask(const char *src)
 {
        char ipaddr[HOSTLEN + 6];
-       u_char buf[IN6ADDRSZ];
+       unsigned char buf[IN6ADDRSZ];
        char *mask, *end;
        unsigned long cidrlen;
 

diff --git a/libathemecore/match.c b/libathemecore/match.c
index a6a3e94ecfc793d9a96e3051824f2a1019c0d108..a68aff8cf791189cbb6064c23fe016de2d13c5a7 100644 (file)
--- a/libathemecore/match.c
+++ b/libathemecore/match.c
@@ -141,7 +141,7 @@ void set_match_mapping(int type)
 
 int match(const char *mask, const char *name)
 {
-       const u_char *m = (const u_char *)mask, *n = (const u_char *)name;
+       const unsigned char *m = (const unsigned char *)mask, *n = (const unsigned char *)name;
        const char *ma = mask, *na = name;
        int wild = 0, q = 0, calls = 0;
 
@@ -172,14 +172,14 @@ int match(const char *mask, const char *name)
                {
                        if (!*n)
                                return 0;
-                       for (m--; (m > (const u_char *) mask) && (*m == '?' || *m == '&' || *m == '#'); m--)
+                       for (m--; (m > (const unsigned char *) mask) && (*m == '?' || *m == '&' || *m == '#'); m--)
                                ;
-                       if ((m > (const u_char *) mask) && (*m == '*') && (m[-1] != '\\'))
+                       if ((m > (const unsigned char *) mask) && (*m == '*') && (m[-1] != '\\'))
                                return 0;
                        if (!wild)
                                return 1;
-                       m = (const u_char *) ma;
-                       n = (const u_char *)++ na;
+                       m = (const unsigned char *) ma;
+                       n = (const unsigned char *)++ na;
                }
                else if (!*n)
                        return 1;
@@ -195,8 +195,8 @@ int match(const char *mask, const char *name)
                {
                        if (!wild)
                                return 1;
-                       m = (const u_char *) ma;
-                       n = (const u_char *)++ na;
+                       m = (const unsigned char *) ma;
+                       n = (const unsigned char *)++ na;
                }
                else
                {