Merge branch 'zdr'

[deb_libnfs.git] / lib / socket.c

diff --git a/lib/socket.c b/lib/socket.c
index 413ebbe4c8e4009cca6f0ccbc506a5a02b657014..83ca50e1765ad365a6f67650edcb01119a133bea 100644 (file)
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -34,8 +34,6 @@
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
-#include <rpc/rpc.h>
-#include <rpc/xdr.h>
 #ifdef HAVE_SYS_FILIO_H
 #include <sys/filio.h>
 #endif
@@ -43,6 +41,7 @@
 #include <sys/sockio.h>
 #endif
 #include <sys/types.h>
+#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-private.h"
@@ -97,7 +96,7 @@ int rpc_which_events(struct rpc_context *rpc)
 
 static int rpc_write_to_socket(struct rpc_context *rpc)
 {
-       int64_t count;
+       int32_t count;
 
        assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
@@ -140,7 +139,9 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
        int available;
        int size;
        int pdu_size;
-       int64_t count;
+       int32_t count;
+
+       assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
        assert(rpc->magic == RPC_CONTEXT_MAGIC);