From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Wed, 28 Nov 2012 02:22:27 +0000 (-0800)
Subject: Merge branch 'zdr'
X-Git-Tag: upstream/1.9.6^2~242
X-Git-Url: https://git.piment-noir.org/?p=deb_libnfs.git;a=commitdiff_plain;h=f816bf4c7641071d83ed2c796c93ce0ddba9b3b4;hp=-c

Merge branch 'zdr'

Manually fixyp some merge conflicts in :
	lib/init.c
	lib/pdu.c
	lib/socket.c
	nfs/Makefile.am
	nfs/nfs.x
	nlm/Makefile.am
---

f816bf4c7641071d83ed2c796c93ce0ddba9b3b4
diff --combined lib/Makefile.am
index 4156a07,d0bd7fc..1b5a66f
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -12,10 -12,11 +12,11 @@@ libnfs_la_SOURCES = 
  	init.c \
  	libnfs.c \
  	libnfs-sync.c \
+ 	libnfs-zdr.c \
  	pdu.c \
  	socket.c
  
 -libnfs_la_LDFLAGS = -version-info 1:3:0
 +libnfs_la_LDFLAGS = -version-info 1:4:0
  libnfs_la_LIBADD = \
  	../mount/libmount.la \
  	../nfs/libnfs.la \
diff --combined lib/socket.c
index 413ebbe,1ba846a..83ca50e
--- a/lib/socket.c
+++ b/lib/socket.c
@@@ -34,8 -34,6 +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 +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 +96,7 @@@ int rpc_which_events(struct rpc_contex
  
  static int rpc_write_to_socket(struct rpc_context *rpc)
  {
- 	int64_t count;
+ 	int32_t count;
  
  	assert(rpc->magic == RPC_CONTEXT_MAGIC);
  
@@@ -140,10 -139,10 +139,12 @@@ static int rpc_read_from_socket(struct 
  	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);
 +
  #if defined(WIN32)
  	if (ioctlsocket(rpc->fd, FIONREAD, &available) != 0) {
  #else