Improve error reporting when unmarshalling of message headers fail.

[deb_libnfs.git] / include / nfsc / libnfs-zdr.h

diff --git a/include/nfsc/libnfs-zdr.h b/include/nfsc/libnfs-zdr.h
index aae56be0ceabfc45641d3499ad03a5c3bc42f62a..6b2ea9123ce99ab86b17fa3cc839c9e230dc2a13 100644 (file)
--- a/include/nfsc/libnfs-zdr.h
+++ b/include/nfsc/libnfs-zdr.h
@@ -29,11 +29,22 @@
 #ifndef _LIBNFS_ZDR_H_
 #define _LIBNFS_ZDR_H_
 
+#ifdef WIN32
+#ifndef CADDR_T_DEFINED
+#define CADDR_T_DEFINED
+typedef char *caddr_t;
+#endif
+#endif
+
 #include <stdio.h>
 #include <assert.h>
 #include <stdint.h>
 #include <sys/types.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define _RPC_RPC_H 1
 #define _RPC_ZDR_H 1
 #define _RPC_AUTH_H 1
@@ -41,6 +52,7 @@
 /* we dont need these */
 typedef void CLIENT;
 struct svc_req {
+       int _dummy_;
 };
 typedef void SVCXPRT;
 
@@ -254,11 +266,13 @@ uint32_t libnfs_zdr_getpos(ZDR *zdrs);
 #define zdr_free libnfs_zdr_free
 void libnfs_zdr_free(zdrproc_t proc, char *objp);
 
+struct rpc_context;
+
 #define zdr_callmsg libnfs_zdr_callmsg
-bool_t libnfs_zdr_callmsg(ZDR *zdrs, struct rpc_msg *msg);
+bool_t libnfs_zdr_callmsg(struct rpc_context *rpc, ZDR *zdrs, struct rpc_msg *msg);
 
 #define zdr_replymsg libnfs_zdr_replymsg
-bool_t libnfs_zdr_replymsg(ZDR *zdrs, struct rpc_msg *msg);
+bool_t libnfs_zdr_replymsg(struct rpc_context *rpc, ZDR *zdrs, struct rpc_msg *msg);
 
 #define authnone_create libnfs_authnone_create
 struct AUTH *libnfs_authnone_create(void);
@@ -272,4 +286,8 @@ struct AUTH *libnfs_authunix_create_default(void);
 #define auth_destroy libnfs_auth_destroy
 void libnfs_auth_destroy(struct AUTH *auth);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif