git: bcd0e31df340 - main - sys/rpc: Use C99 fixed-width integer types.

The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=bcd0e31df340168d2cfdfd6ca4770d9285304fbd

commit bcd0e31df340168d2cfdfd6ca4770d9285304fbd
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2021-12-28 17:43:15 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2021-12-28 17:43:15 +0000

    sys/rpc: Use C99 fixed-width integer types.
    
    No functional change.
    
    Reviewed by:    imp, emaste
    Differential Revision:  https://reviews.freebsd.org/D33640
---
 sys/rpc/rpc_generic.c               | 4 ++--
 sys/rpc/rpcsec_gss/svc_rpcsec_gss.c | 2 +-
 sys/rpc/svc.h                       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/rpc/rpc_generic.c b/sys/rpc/rpc_generic.c
index 1a02085efe47..d75f23493f90 100644
--- a/sys/rpc/rpc_generic.c
+++ b/sys/rpc/rpc_generic.c
@@ -309,7 +309,7 @@ __rpc_taddr2uaddr_af(int af, const struct netbuf *nbuf)
 	struct sockaddr_in6 *sin6;
 	char namebuf6[INET6_ADDRSTRLEN];
 #endif
-	u_int16_t port;
+	uint16_t port;
 
 	sbuf_new(&sb, NULL, 0, SBUF_AUTOEXTEND);
 
@@ -793,7 +793,7 @@ bindresvport(struct socket *so, struct sockaddr *sa)
 #endif
 	struct sockopt opt;
 	int proto, portrange, portlow;
-	u_int16_t *portp;
+	uint16_t *portp;
 	socklen_t salen;
 
 	if (sa == NULL) {
diff --git a/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c b/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
index c9a09438d907..d87a57ad514b 100644
--- a/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
+++ b/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
@@ -1180,7 +1180,7 @@ svc_rpc_gss_callback(struct svc_rpc_gss_client *client, struct svc_req *rqst)
 static bool_t
 svc_rpc_gss_check_replay(struct svc_rpc_gss_client *client, uint32_t seq)
 {
-	u_int32_t offset;
+	uint32_t offset;
 	int word, bit;
 	bool_t result;
 
diff --git a/sys/rpc/svc.h b/sys/rpc/svc.h
index 9a6efdef78a9..7f6d7c948193 100644
--- a/sys/rpc/svc.h
+++ b/sys/rpc/svc.h
@@ -176,7 +176,7 @@ typedef struct __rpc_svcxprt {
 	int		xp_type;	/* transport type */
 	int		xp_idletimeout; /* idle time before closing */
 	time_t		xp_lastactive;	/* time of last RPC */
-	u_int64_t	xp_sockref;	/* set by nfsv4 to identify socket */
+	uint64_t	xp_sockref;	/* set by nfsv4 to identify socket */
 	int		xp_upcallset;	/* socket upcall is set up */
 	uint32_t	xp_snd_cnt;	/* # of bytes to send to socket */
 	uint32_t	xp_snt_cnt;	/* # of bytes sent to socket */