[src/trunk]: src/sys/compat/netbsd32 s/u_intN_t/uintN_t/

[simonb <simonb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f7b056d6beb1
branches:  trunk
changeset: 958767:f7b056d6beb1
user:      simonb <simonb%NetBSD.org@localhost>
date:      Mon Jan 18 23:14:22 2021 +0000

description:
s/u_intN_t/uintN_t/

diffstat:

 sys/compat/netbsd32/netbsd32.h        |   6 +++---
 sys/compat/netbsd32/netbsd32_conv.h   |  10 +++++-----
 sys/compat/netbsd32/netbsd32_exec.h   |   6 +++---
 sys/compat/netbsd32/netbsd32_socket.c |   8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diffs (117 lines):

diff -r 89854d6a240e -r f7b056d6beb1 sys/compat/netbsd32/netbsd32.h
--- a/sys/compat/netbsd32/netbsd32.h    Mon Jan 18 20:02:34 2021 +0000
+++ b/sys/compat/netbsd32/netbsd32.h    Mon Jan 18 23:14:22 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32.h,v 1.135 2021/01/14 08:00:45 simonb Exp $    */
+/*     $NetBSD: netbsd32.h,v 1.136 2021/01/18 23:14:22 simonb Exp $    */
 
 /*
  * Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green
@@ -1071,14 +1071,14 @@
 struct netbsd32_nfsd_srvargs {
        netbsd32_nfsdp  nsd_nfsd;
        uid_t           nsd_uid;
-       u_int32_t       nsd_haddr;
+       uint32_t        nsd_haddr;
        struct uucred   nsd_cr;
        int             nsd_authlen;
        netbsd32_u_charp nsd_authstr;
        int             nsd_verflen;
        netbsd32_u_charp nsd_verfstr;
        struct netbsd32_timeval nsd_timestamp;
-       u_int32_t       nsd_ttl;
+       uint32_t        nsd_ttl;
        NFSKERBKEY_T    nsd_key;
 };
 
diff -r 89854d6a240e -r f7b056d6beb1 sys/compat/netbsd32/netbsd32_conv.h
--- a/sys/compat/netbsd32/netbsd32_conv.h       Mon Jan 18 20:02:34 2021 +0000
+++ b/sys/compat/netbsd32/netbsd32_conv.h       Mon Jan 18 23:14:22 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_conv.h,v 1.42 2019/11/18 04:17:08 rin Exp $   */
+/*     $NetBSD: netbsd32_conv.h,v 1.43 2021/01/18 23:14:22 simonb Exp $        */
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -245,8 +245,8 @@
     int len)
 {
        int i, error=0;
-       u_int32_t iov_base;
-       u_int32_t iov_len;
+       uint32_t iov_base;
+       uint32_t iov_len;
        /*
         * We could allocate an iov32p, do a copyin, and translate
         * each field and then free it all up, or we could copyin
@@ -799,11 +799,11 @@
         */
        for (; ndp < endp; ndp = nndp) {
                nndp = _DIRENT_NEXT(ndp);
-               odp->d_fileno = (u_int32_t)ndp->d_fileno;
+               odp->d_fileno = (uint32_t)ndp->d_fileno;
                if (ndp->d_namlen >= sizeof(odp->d_name))
                        odp->d_namlen = sizeof(odp->d_name) - 1;
                else
-                       odp->d_namlen = (u_int8_t)ndp->d_namlen;
+                       odp->d_namlen = (uint8_t)ndp->d_namlen;
                odp->d_type = ndp->d_type;
                (void)memcpy(odp->d_name, ndp->d_name, (size_t)odp->d_namlen);
                odp->d_name[odp->d_namlen] = '\0';
diff -r 89854d6a240e -r f7b056d6beb1 sys/compat/netbsd32/netbsd32_exec.h
--- a/sys/compat/netbsd32/netbsd32_exec.h       Mon Jan 18 20:02:34 2021 +0000
+++ b/sys/compat/netbsd32/netbsd32_exec.h       Mon Jan 18 23:14:22 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_exec.h,v 1.34 2019/01/27 02:08:40 pgoyette Exp $      */
+/*     $NetBSD: netbsd32_exec.h,v 1.35 2021/01/18 23:14:22 simonb Exp $        */
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -83,9 +83,9 @@
 netbsd32_copyargs(struct lwp *l, struct exec_package *pack,
                struct ps_strings *arginfo, char **stackp, void *argp)
 {
-       u_int32_t *cpp = (u_int32_t *)*stackp;
+       uint32_t *cpp = (uint32_t *)*stackp;
        netbsd32_pointer_t dp;
-       u_int32_t nullp = 0;
+       uint32_t nullp = 0;
        char *sp;
        size_t len;
        int argc = arginfo->ps_nargvstr;
diff -r 89854d6a240e -r f7b056d6beb1 sys/compat/netbsd32/netbsd32_socket.c
--- a/sys/compat/netbsd32/netbsd32_socket.c     Mon Jan 18 20:02:34 2021 +0000
+++ b/sys/compat/netbsd32/netbsd32_socket.c     Mon Jan 18 23:14:22 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_socket.c,v 1.53 2019/09/28 08:21:08 mlelstv Exp $     */
+/*     $NetBSD: netbsd32_socket.c,v 1.54 2021/01/18 23:14:22 simonb Exp $      */
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.53 2019/09/28 08:21:08 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.54 2021/01/18 23:14:22 simonb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -386,7 +386,7 @@
        struct mbuf *ctl_mbuf;
        ssize_t resid = mp->msg_controllen;
        size_t clen, cidx = 0, cspace;
-       u_int8_t *control;
+       uint8_t *control;
        int error;
 
        ctl_mbuf = m_get(M_WAIT, MT_CONTROL);
@@ -414,7 +414,7 @@
 
                /* Check the buffer is big enough */
                if (__predict_false(cidx + cspace > clen)) {
-                       u_int8_t *nc;
+                       uint8_t *nc;
                        size_t nclen;
 
                        nclen = cidx + cspace;