Module Name: src
Committed By: plunky
Date: Tue Aug 30 17:09:52 UTC 2011
Modified Files:
src/include/rpc: xdr.h
src/lib/libc/rpc: rpc.3
Log Message:
provide a complete prototype for xdrproc_t
(I found no instances where three arguments were actually
used, as per the claim in the comment. If there are any
in third party code then they will need to use a cast)
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/include/rpc/xdr.h
cvs rdiff -u -r1.22 -r1.23 src/lib/libc/rpc/rpc.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/rpc/xdr.h
diff -u src/include/rpc/xdr.h:1.26 src/include/rpc/xdr.h:1.27
--- src/include/rpc/xdr.h:1.26 Mon Jul 4 07:54:38 2011
+++ src/include/rpc/xdr.h Tue Aug 30 17:09:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xdr.h,v 1.26 2011/07/04 07:54:38 manu Exp $ */
+/* $NetBSD: xdr.h,v 1.27 2011/08/30 17:09:51 plunky Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -130,10 +130,8 @@
* The opaque pointer generally points to a structure of the data type
* to be decoded. If this pointer is 0, then the type routines should
* allocate dynamic storage of the appropriate size and return it.
- *
- * XXX can't actually prototype it, because some take three args!!!
*/
-typedef bool_t (*xdrproc_t)(/* XDR *, void *, u_int */);
+typedef bool_t (*xdrproc_t)(XDR *, const void *);
/*
* Operations defined on a XDR handle
Index: src/lib/libc/rpc/rpc.3
diff -u src/lib/libc/rpc/rpc.3:1.22 src/lib/libc/rpc/rpc.3:1.23
--- src/lib/libc/rpc/rpc.3:1.22 Mon Mar 22 19:30:54 2010
+++ src/lib/libc/rpc/rpc.3 Tue Aug 30 17:09:52 2011
@@ -1,6 +1,6 @@
.\" @(#)rpc.3n 1.31 93/08/31 SMI; from SVr4
.\" Copyright 1989 AT&T
-.\" $NetBSD: rpc.3,v 1.22 2010/03/22 19:30:54 joerg Exp $
+.\" $NetBSD: rpc.3,v 1.23 2011/08/30 17:09:52 plunky Exp $
.Dd May 7, 1993
.Dt RPC 3
.Os
@@ -254,9 +254,8 @@
* structure of the data type to be decoded. If this points to 0,
* then the type routines should allocate dynamic storage of the
* appropriate size and return it.
- * bool_t (*xdrproc_t)(XDR *, caddr_t *);
*/
-typedef bool_t (*xdrproc_t)();
+typedef bool_t (*xdrproc_t)(XDR *, const void *);
/*
* The XDR handle.
