From nobody Tue Dec 28 17:51:18 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 6D23B190F9DB; Tue, 28 Dec 2021 17:51:23 +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 4JNht14QGrz3F6X; Tue, 28 Dec 2021 17:51:21 +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 F1D1116250; Tue, 28 Dec 2021 17:51:18 +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 1BSHpImv053769; Tue, 28 Dec 2021 17:51:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BSHpI7X053768; Tue, 28 Dec 2021 17:51:18 GMT (envelope-from git) Date: Tue, 28 Dec 2021 17:51:18 GMT Message-Id: <202112281751.1BSHpI7X053768@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: 2262f7dcf476 - main - sys/xdr: 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: 2262f7dcf476b48bdf3dfc5d460cc5a5e14e23cd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640713881; 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=yLp83Zybt6Fnk3tdyTJwQ6UgHOiWUdoEqOOaivi1MCE=; b=TdiFKU+tLbFsLTDfejX7jzhjLwtEwmB7xLaz2u6uQ4D2F4V5f6MDse76M6mkfYapp7/rlq Vco2WetpRB9pnAtISVm8FEGyv0aStmP5aKFDc8iUEUKlPz95zuMUtnFggHe13V5ANFvVn8 jJfTV2PjodYiIW5mEUX5Zbw9czM8e4ssHPd+XHG/YdjCSR3Rv4X4qhv5zgXf/a8zu6qbSY ZngkvW9il1Tqyv16pPLeENrY/BYbdnkrWY8YN5lCJFjPVIUWU8onUap250faVYUj5n0Goz FyQf29E4cXAP5TrFNVV+AM4Jsx4f2ot9X+P0Lzg7kF6qMbU2gv7z8cvbHLdiUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640713881; a=rsa-sha256; cv=none; b=KAK2Grg/u7xitX934eonVgsKRosyj2QSucbwxyvBKoWhQKt/VsFr8G47mektx+ZjdWsHiQ ASIDIqOwHcPFPYpCpxvRbFX0C/iTT0rxvyHBYW8fvCc/ttcqJcY2D9QnE3pTyrrM4XER3u gDB6YXaqA0K6lRW3b+b4NOJdf1kBWdFCYqGk+nWITV54oHE2jo7eI8GX1g6q6R3d+S8Sp2 ImvYAq5E8FgMGuYouLEKzpUidYYorZAk5XELxWVS05FCuGCTdFREb9rYAzTnZbw3T52Fsd 9tpK/PEmD2jcexF0CU0PndBdv0JoUv8Tgp/F/BE0owT1HDjKyC89sTPisB98jg== 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=2262f7dcf476b48bdf3dfc5d460cc5a5e14e23cd commit 2262f7dcf476b48bdf3dfc5d460cc5a5e14e23cd Author: John Baldwin AuthorDate: 2021-12-28 17:43:26 +0000 Commit: John Baldwin CommitDate: 2021-12-28 17:43:26 +0000 sys/xdr: Use C99 fixed-width integer types. No functional change. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D33642 --- sys/xdr/xdr_mem.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/xdr/xdr_mem.c b/sys/xdr/xdr_mem.c index 51449e70b675..bf365a8da210 100644 --- a/sys/xdr/xdr_mem.c +++ b/sys/xdr/xdr_mem.c @@ -121,7 +121,7 @@ xdrmem_getlong_aligned(XDR *xdrs, long *lp) if (xdrs->x_handy < sizeof(int32_t)) return (FALSE); xdrs->x_handy -= sizeof(int32_t); - *lp = ntohl(*(u_int32_t *)xdrs->x_private); + *lp = ntohl(*(uint32_t *)xdrs->x_private); xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t); return (TRUE); } @@ -133,7 +133,7 @@ xdrmem_putlong_aligned(XDR *xdrs, const long *lp) if (xdrs->x_handy < sizeof(int32_t)) return (FALSE); xdrs->x_handy -= sizeof(int32_t); - *(u_int32_t *)xdrs->x_private = htonl((u_int32_t)*lp); + *(uint32_t *)xdrs->x_private = htonl((uint32_t)*lp); xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t); return (TRUE); } @@ -141,7 +141,7 @@ xdrmem_putlong_aligned(XDR *xdrs, const long *lp) static bool_t xdrmem_getlong_unaligned(XDR *xdrs, long *lp) { - u_int32_t l; + uint32_t l; if (xdrs->x_handy < sizeof(int32_t)) return (FALSE); @@ -155,12 +155,12 @@ xdrmem_getlong_unaligned(XDR *xdrs, long *lp) static bool_t xdrmem_putlong_unaligned(XDR *xdrs, const long *lp) { - u_int32_t l; + uint32_t l; if (xdrs->x_handy < sizeof(int32_t)) return (FALSE); xdrs->x_handy -= sizeof(int32_t); - l = htonl((u_int32_t)*lp); + l = htonl((uint32_t)*lp); memmove(xdrs->x_private, &l, sizeof(int32_t)); xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t); return (TRUE);