From nobody Tue Nov 05 14:29:58 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 4XjW2H2d0dz5c9ks; Tue, 05 Nov 2024 14:29:59 +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 4XjW2H0R0Bz54wL; Tue, 5 Nov 2024 14:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730816999; 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=qRWhSu5/t+piYY0XRgoBQeZTrMwuXAn6jmEItHBQ/yQ=; b=yJpcCDcuOItWYJbRI9DQfTjhTEWKkAYsjomp+nnmHcxzFuMwhi4RJpwmBXxPyzSkVHa2+d nql+E8Vxf8cFW0IVksQ94asC2ecwnR0P1qzgG0FupQ+gAZsJQQgBG310GrEHresVLVLJ8P suF0yTmTGQTy7/lG+OtuQ7XRorEWf1GMN3kdcMDR8OFu+VbR1l4M9a25BSEoGxSy2qTs+H BYWbS2TwCqluCYjA3tQglufZfrDKBTXdbl6Hxj8IAuYTyU0GfLvpPaHiQg+F06zmycnFrS bQD32d3n1c8yf/nyC1Ea3GhAbSCGnjIxW+ez3754bST2p/meKZ8NWncMN+msNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730816999; 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=qRWhSu5/t+piYY0XRgoBQeZTrMwuXAn6jmEItHBQ/yQ=; b=iCVPdTsv7sJmRxt5XjdLDEu9V5w6nypl80fB+5GjyFoRLAk+RCkFkEpi9zl01mVXhSklx8 vBbdMLOQdIzJrY7f9VDkia7bG9fOSuMJO50t0LjMK4/NwtB/k5FiKW9y2YH5Ghn0q6M3qK ljdJqshmheQSNvW9SQweB/X5Vi7js2iukVTXy8c61dInrBiibkTXA/Q73HxCF+uYK0vpJ7 KX03UOzaQv/ap8XcsEHjlpHSNZcbfphrK0pY1ooCaM9poOZZ8QxWJI4MjJ4vXapk+PgAJy sEQUG10nfAiF4Bfu4kskCCoaUp/Zq2EC42EVdtqqyaxoYjIwmpZwyL9d84o4Cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730816999; a=rsa-sha256; cv=none; b=HKkA+Rm/Wptqb4kJaTlINb04+/6pZ9ulBsW2V/3k94e2VFpQZ3petetyP/iAAuLmvPXHUs Bxtr8NJcbeBYaEOhHThJJS0RLN4GcoHY812ZT/JmHNtRkqFP8douEzr491cnsAOOVDS6Y1 3maKucaKk553YuuTwMBh0Km3D0rm28gv/mUC9X9Dqsi+9zrFnd8qnNbccz3QLPM1bzcGoJ SkQvfLCmgbymYfS23kPXwqlwD7OC+QzB+vvo2B/2R49iZeJ126FXpA4g+ZYFBz7favo0q5 UGsHPFDvS+PN8gvydnfYoTPvgaSPMiqZT9z4Cg4pTZFko5urYFY55f15vp46Rg== 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 4XjW2G6wBQzKws; Tue, 5 Nov 2024 14:29:58 +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 4A5ETwmt081053; Tue, 5 Nov 2024 14:29:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5ETwMK081050; Tue, 5 Nov 2024 14:29:58 GMT (envelope-from git) Date: Tue, 5 Nov 2024 14:29:58 GMT Message-Id: <202411051429.4A5ETwMK081050@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: b698c825f3b6 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: b698c825f3b6699b278122da776bdfe5f360619f Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b698c825f3b6699b278122da776bdfe5f360619f commit b698c825f3b6699b278122da776bdfe5f360619f Author: Mark Johnston AuthorDate: 2024-10-30 19:27:18 +0000 Commit: Mark Johnston CommitDate: 2024-11-05 01:05:26 +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 15f80502ea39..bc5e8c542498 100644 --- a/lib/libc/xdr/xdr.c +++ b/lib/libc/xdr/xdr.c @@ -88,13 +88,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); }