From nobody Tue Nov 05 14:30:11 2024 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 4XjW2W4tcHz5c9s9; Tue, 05 Nov 2024 14:30:11 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjW2W3z9vz55MG; Tue, 5 Nov 2024 14:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730817011; 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=KQXwnbe0A/gWd61RACcrwytvklJpfErIuDgujZK8qLA=; b=pywLGz4PneEZJEGUDNTukVwCnLQObMfcFH1IpGCIQJcIMImaWsDaqaZCO4eoXe8RrmYg4y Gtthvn90EhmJNpFR6EXlPk097MdbQWVEBjcNctrcg1mrffS6wcqNga79e2AkYU+1Pk2Hz8 hF4ZIR/hMRTrfI67TCzw9JKsV8fX9fPfhQE47SwCDTbTj4q2XjKnYgIlfiXTyL4WESX2Yh QuG83AH0+xWBRj1XZr8oBBgnofbFVyjfW40by2U7PNWsi5ej3j0PBUiMMmNkVG8O1K99pz 47cnrFTHAgtFXfNToYvInGC3jBYEuN5w4FM9aHSufWLrGmzaKO+1lxZzWmzSwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730817011; 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=KQXwnbe0A/gWd61RACcrwytvklJpfErIuDgujZK8qLA=; b=isvUtniHrhqkMRTSfpZux6a1xRjkinyp6cXaj/OTWRxkZhDW6f1dvUdAuiM9+er7WVZMTT OLaDcFWtTXR7xJEN72rnSwd1/RoWgxLv0jGdKvknwtMN9JyUKPzgYvgFgzzpTordKRGmqO SDzF5SfU4cvNCXP9s8u9Vt0wDP3rHTDj8IHJVUave/LYdmpxWoeiU2Y4hBXfHtEEAHA00V 06WL9nPO9m9pjaM2V2MpHQVz/eae9uL4X4RPQOnaaxOYGhx5iWjRdvOrh7owHtxe54guAg GeVFQXoaLxFy90B6e/YKUZbwVJTLNCKb6e5cza1i9guL9pL2Aifs+GyuluR8eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730817011; a=rsa-sha256; cv=none; b=lyhJB3P8tHth8A2PNBYvsLQ5eyDn5/Po4/lTcXoS5hF6JOseKDH+m/CuMdf0uh2Gi2mKt4 C2SAv5ykf2r+BWfbh7Sk0xPMgzQoq4y1KEj8XRAicGmqL5dhSLhzJyn+6jSTWweTKZKk1X zcQlm05RNrd/PsN2MLtnk28zzCzqUm3x/zvCFWP8fcXqqKoIn4AUxNmaGMTlmqZviMCwZO C2sR7pMTlNuJiNth401pkx9dSSIPA3ZwhRfrb99Qqi6+YtHpMrQA6QY6nM2IiWG6kvdRiV P8E6dRNADQlNxm9q7RlyRuJnQWoiweTUyx+TJ2dneewrX3nIemBZYJKNrTDzqg== 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 4XjW2W3WbHzLMJ; Tue, 5 Nov 2024 14:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A5EUBcn086245; Tue, 5 Nov 2024 14:30:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5EUBq5086237; Tue, 5 Nov 2024 14:30:11 GMT (envelope-from git) Date: Tue, 5 Nov 2024 14:30:11 GMT Message-Id: <202411051430.4A5EUBq5086237@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b59d57894580 - stable/13 - rpc: Fix the definition of xdr_void() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b59d578945807e487a2ed20ff6387f40c89db47d Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b59d578945807e487a2ed20ff6387f40c89db47d commit b59d578945807e487a2ed20ff6387f40c89db47d Author: Mark Johnston AuthorDate: 2024-10-30 19:27:18 +0000 Commit: Mark Johnston CommitDate: 2024-11-05 01:05:31 +0000 rpc: Fix the definition of xdr_void() xdr_void() should have type xdrproc_t, make it so. PR: 280514 Reviewed by: brooks, dim MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47340 (cherry picked from commit a5d1cf5e362a2e3c3ebdf6d8f2b86658a6d0b9d6) --- include/rpc/xdr.h | 2 +- lib/libc/xdr/xdr.c | 4 +--- sys/rpc/xdr.h | 2 +- sys/xdr/xdr.c | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h index 624a3c294650..58a26760cb77 100644 --- a/include/rpc/xdr.h +++ b/include/rpc/xdr.h @@ -281,7 +281,7 @@ struct xdr_discrim { * These are the "generic" xdr routines. */ __BEGIN_DECLS -extern bool_t xdr_void(void); +extern bool_t xdr_void(XDR *, void *); extern bool_t xdr_int(XDR *, int *); extern bool_t xdr_u_int(XDR *, u_int *); extern bool_t xdr_long(XDR *, long *); diff --git a/lib/libc/xdr/xdr.c b/lib/libc/xdr/xdr.c index 6d44a012443b..3dfe15f28b88 100644 --- a/lib/libc/xdr/xdr.c +++ b/lib/libc/xdr/xdr.c @@ -89,13 +89,11 @@ xdr_free(xdrproc_t proc, void *objp) * XDR nothing */ bool_t -xdr_void(void) +xdr_void(XDR *xdrs __unused, void *ptr __unused) { - return (TRUE); } - /* * XDR integers */ diff --git a/sys/rpc/xdr.h b/sys/rpc/xdr.h index cd57b4069342..ac9130f65e36 100644 --- a/sys/rpc/xdr.h +++ b/sys/rpc/xdr.h @@ -288,7 +288,7 @@ struct xdr_discrim { * These are the "generic" xdr routines. */ __BEGIN_DECLS -extern bool_t xdr_void(void); +extern bool_t xdr_void(XDR *, void *); extern bool_t xdr_int(XDR *, int *); extern bool_t xdr_u_int(XDR *, u_int *); extern bool_t xdr_long(XDR *, long *); diff --git a/sys/xdr/xdr.c b/sys/xdr/xdr.c index af0d28bd65b7..605efd52e3a2 100644 --- a/sys/xdr/xdr.c +++ b/sys/xdr/xdr.c @@ -88,9 +88,8 @@ xdr_free(xdrproc_t proc, void *objp) * XDR nothing */ bool_t -xdr_void(void) +xdr_void(XDR *xrds __unused, void *ptr __unused) { - return (TRUE); }