From nobody Tue Dec 28 17:51:16 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 07FE2190F6F1; Tue, 28 Dec 2021 17:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JNhsx6svsz3F8W; Tue, 28 Dec 2021 17:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AB311160C2; Tue, 28 Dec 2021 17:51:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BSHpGg1053721; Tue, 28 Dec 2021 17:51:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BSHpGwd053720; Tue, 28 Dec 2021 17:51:16 GMT (envelope-from git) Date: Tue, 28 Dec 2021 17:51:16 GMT Message-Id: <202112281751.1BSHpGwd053720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: bcd0e31df340 - main - sys/rpc: Use C99 fixed-width integer types. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcd0e31df340168d2cfdfd6ca4770d9285304fbd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640713879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ypbaW9in3ElW9iaDtAp6PlwxoHWSVmiJqB0180wuvS4=; b=N2R1vNmXroRC6lHfgwvDzg0PTQ8JLlA0TgbslJL/jsUF6o7BUmzc9ipZWq8No9Q6X71vto TY4374e0wntQ4jVEcRmGi4c0me0Hx4hBPNajnddcUn9RTZ6YiPbGDYbyug+jleU+7Qn+Sh fy7U71+TtNDXl7xnPQ06StMuHiCkUFWVAbpQ9m5xkTPbHDN/e7AXuTGMDy8Y6LmttANHA3 2FYRqiKiXAAVS1TOd+6nLxfaIBhE9U3huutf0of3ErPh35hWM64hcv7BAEhSSybErlJksD FAhmi4icOchZcXcHhvhE4PnKZbkKb6KuVOxF/1JmB9QP2QvkKcJiMCV/uMcxuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640713879; a=rsa-sha256; cv=none; b=h+0l38JPFZeb/WG+v8ysIfCb8ujgrY4TQ4huq8F1vD1grSK/OEanO1y9/9WzmWq0wxSJgB +2eDsW8seOcsvmy3l9KJdVcg3ryR1XmWckVdd36612bEUNdVhx5Fkf0iij1TUP0aZsKl9Q PVuRxCZ2THm/4H+gWi0ul94bsyRB3juVFeTa2Zkvefu6ManTHdg9ElLCz5t9yjQ0j6hley lFIR9yCsYiIiU2uYvYkpTTseqfdcS6ZGU2NShs0TmDpAcoVAJnGfWDWl5g3uUCD9qmG7Xq lKDOtSyNfihxg87DFGW6GgsCWfuV9B2NPu4PH9cC0TxRVB4xp76dASKxFC3QZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bcd0e31df340168d2cfdfd6ca4770d9285304fbd commit bcd0e31df340168d2cfdfd6ca4770d9285304fbd Author: John Baldwin AuthorDate: 2021-12-28 17:43:15 +0000 Commit: John Baldwin 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 */