Date: Tue, 5 Nov 2024 16:19:32 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: a231e2990776 - releng/14.2 - rpc: Fix the definition of xdr_void() Message-ID: <202411051619.4A5GJWi1084490@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch releng/14.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a231e2990776a28f8c3b01b946e7774b3f6bb39b commit a231e2990776a28f8c3b01b946e7774b3f6bb39b Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2024-10-30 19:27:18 +0000 Commit: Mark Johnston <markj@FreeBSD.org> 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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411051619.4A5GJWi1084490>