Module Name: src
Committed By: simonb
Date: Mon Jan 18 23:14:22 UTC 2021
Modified Files:
src/sys/compat/netbsd32: netbsd32.h netbsd32_conv.h netbsd32_exec.h
netbsd32_socket.c
Log Message:
s/u_intN_t/uintN_t/
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.42 -r1.43 src/sys/compat/netbsd32/netbsd32_conv.h
cvs rdiff -u -r1.34 -r1.35 src/sys/compat/netbsd32/netbsd32_exec.h
cvs rdiff -u -r1.53 -r1.54 src/sys/compat/netbsd32/netbsd32_socket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.135 src/sys/compat/netbsd32/netbsd32.h:1.136
--- src/sys/compat/netbsd32/netbsd32.h:1.135 Thu Jan 14 08:00:45 2021
+++ src/sys/compat/netbsd32/netbsd32.h Mon Jan 18 23:14:22 2021
@@ -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 @@ typedef netbsd32_pointer_t netbsd32_nfsd
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;
};
Index: src/sys/compat/netbsd32/netbsd32_conv.h
diff -u src/sys/compat/netbsd32/netbsd32_conv.h:1.42 src/sys/compat/netbsd32/netbsd32_conv.h:1.43
--- src/sys/compat/netbsd32/netbsd32_conv.h:1.42 Mon Nov 18 04:17:08 2019
+++ src/sys/compat/netbsd32/netbsd32_conv.h Mon Jan 18 23:14:22 2021
@@ -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 @@ netbsd32_to_iovecin(const struct netbsd3
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 @@ netbsd32_to_dirent12(char *buf, int nbyt
*/
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';
Index: src/sys/compat/netbsd32/netbsd32_exec.h
diff -u src/sys/compat/netbsd32/netbsd32_exec.h:1.34 src/sys/compat/netbsd32/netbsd32_exec.h:1.35
--- src/sys/compat/netbsd32/netbsd32_exec.h:1.34 Sun Jan 27 02:08:40 2019
+++ src/sys/compat/netbsd32/netbsd32_exec.h Mon Jan 18 23:14:22 2021
@@ -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 @@ static __inline int
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;
Index: src/sys/compat/netbsd32/netbsd32_socket.c
diff -u src/sys/compat/netbsd32/netbsd32_socket.c:1.53 src/sys/compat/netbsd32/netbsd32_socket.c:1.54
--- src/sys/compat/netbsd32/netbsd32_socket.c:1.53 Sat Sep 28 08:21:08 2019
+++ src/sys/compat/netbsd32/netbsd32_socket.c Mon Jan 18 23:14:22 2021
@@ -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 @@ copyin32_msg_control(struct lwp *l, stru
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 @@ copyin32_msg_control(struct lwp *l, stru
/* 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;
