D33640.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D33640.diff
View Options

	diff --git a/sys/rpc/rpc_generic.c b/sys/rpc/rpc_generic.c
	--- a/sys/rpc/rpc_generic.c
	+++ b/sys/rpc/rpc_generic.c
	@@ -309,7 +309,7 @@
	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 @@
	#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
	--- a/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
	+++ b/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
	@@ -1180,7 +1180,7 @@
	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
	--- a/sys/rpc/svc.h
	+++ b/sys/rpc/svc.h
	@@ -176,7 +176,7 @@
	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 */