From nobody Tue Nov 05 16:19:32 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 4XjYSj1w09z5cH0l; Tue, 05 Nov 2024 16:19:33 +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 4XjYSj1J1Tz41n4; Tue, 5 Nov 2024 16:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730823573; 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=gn1YpFfB5uPK8jmc6ScBPVqdTXp+XqhwKirdwxmtWEA=; b=msM2/2BOat/cUGMI9kkEIn7BHVtdZD95wDV6LccKjgy7QGMXftoK4PUpKyZCPn5+6zZ8tW LkZCYCq1UJ2iuHeE4zt7s68cBDrRuMEQYymkLGVv4CK13+57TO9uwCzYBsCoRCBKHr+I/9 rj86qYY0+xS5fgdIm9sNpttUBKiI3Dp8dULL/v6m3GGwn7fKYiGfyO2l0/4xtg6u19EkQP NbqfmzmYD51RULrgdxmqyJ9C37d+nTMKzb8X9++kKg0eDGQVBR0p4g9kjCq6pP08NG2OGa m8NuORms0pSgMDz2nWUtPlskJIJ+OODDtUpLGUbHTnTpsfINesheLfJlT6T+6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730823573; 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=gn1YpFfB5uPK8jmc6ScBPVqdTXp+XqhwKirdwxmtWEA=; b=uvn5MCSjjGGR5cGl3o+HTwmEBbO5+2NfdfWYxmyo4JzPvRnQuGPOv+ZEQAOZ/kDT5D/dVG jTBHe3ysI0jqwUxCtF5sOlyyG5c1PdHrFyVc3unwDJVKZFZTZ9E8eYjWUnUkVNkCWWbD7H NyPFVnIUFdgJ/lgMxkxP5CjUo1KuKosznypSKA8xifNlNywSOXkHC5cPSBa8Ul9+8RgGoU rCaLKWCSNcaK+UTSgx6HpoDnGlm6Dm1zqlJ/okE73ALIbMq7v5mngv2KqLtaOzdyxy0+YK Qfv84spwh23A+N4AMRAAgANu6VtYHgWMUnZAz+DIMvhn82Mm+hE4UJ07v/hdDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730823573; a=rsa-sha256; cv=none; b=KVhQr2A95JHn1wJZsfNvsFqltzdWb6QXQUU7SYDbJkg0s9xtody/n3PifF+xmciHlHB5pF /fAp2rXGASW599YZY1pWwYcSfdPv2RQMzEzaFQDEZrPeWfV94i8K6KaI2PeB+iSTz6LDjv Mph/jPWkYd81D+v+0YyYXk0Ygmf+mrZdJ65tRQ5tOOkbxnVkH708jKx00JrbJi2YD0TsgH I1wSmOB3oTTEF6EuFkeuY5KuxqpSKZrp1RmvMo+vrIU6BzS/JMVsBveBvvnVfgcFaktqhn f20jnTxAzHMPdKSlwqV213bl9tmIqsJPXpsNDYMn/fTO+1fbN9QxY9cZ/LMzgg== 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 4XjYSj0nHtzNmV; Tue, 5 Nov 2024 16:19:33 +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 4A5GJW6W084493; Tue, 5 Nov 2024 16:19:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5GJWi1084490; Tue, 5 Nov 2024 16:19:32 GMT (envelope-from git) Date: Tue, 5 Nov 2024 16:19:32 GMT Message-Id: <202411051619.4A5GJWi1084490@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: a231e2990776 - releng/14.2 - 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/releng/14.2 X-Git-Reftype: branch X-Git-Commit: a231e2990776a28f8c3b01b946e7774b3f6bb39b Auto-Submitted: auto-generated The branch releng/14.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a231e2990776a28f8c3b01b946e7774b3f6bb39b commit a231e2990776a28f8c3b01b946e7774b3f6bb39b Author: Mark Johnston AuthorDate: 2024-10-30 19:27:18 +0000 Commit: Mark Johnston CommitDate: 2024-11-05 16:17:03 +0000 rpc: Fix the definition of xdr_void() xdr_void() should have type xdrproc_t, make it so. Approved by: re (kib) PR: 280514 Reviewed by: brooks, dim MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47340 (cherry picked from commit a5d1cf5e362a2e3c3ebdf6d8f2b86658a6d0b9d6) (cherry picked from commit b698c825f3b6699b278122da776bdfe5f360619f) --- 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); }