git: a5d1cf5e362a - main - rpc: Fix the definition of xdr_void()

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=a5d1cf5e362a2e3c3ebdf6d8f2b86658a6d0b9d6

commit a5d1cf5e362a2e3c3ebdf6d8f2b86658a6d0b9d6
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-10-30 19:27:18 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-10-30 19:27:18 +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
---
 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 11d6a8d13b49..ecf10e1659e4 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -278,7 +278,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 6992cae69bf1..59a843405abf 100644
--- a/lib/libc/xdr/xdr.c
+++ b/lib/libc/xdr/xdr.c
@@ -84,13 +84,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 745eb115f58f..1bb03a2a58ba 100644
--- a/sys/rpc/xdr.h
+++ b/sys/rpc/xdr.h
@@ -285,7 +285,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 245ac7cef4fb..81d238ebf19f 100644
--- a/sys/xdr/xdr.c
+++ b/sys/xdr/xdr.c
@@ -84,9 +84,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);
 }