From: Ronnie Sahlberg Date: Tue, 22 Oct 2013 02:15:11 +0000 (-0700) Subject: Make xid be a uint32_t and not either unsigned long or unsigned int X-Git-Tag: upstream/1.9.6^2~185 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=b93082da2b96a2751f9d7566ad5ec42415080c4b;p=deb_libnfs.git Make xid be a uint32_t and not either unsigned long or unsigned int --- diff --git a/include/libnfs-private.h b/include/libnfs-private.h index 79ac411..328d79d 100644 --- a/include/libnfs-private.h +++ b/include/libnfs-private.h @@ -68,7 +68,7 @@ struct rpc_context { void *connect_data; struct AUTH *auth; - unsigned long xid; + uint32_t xid; /* buffer used for encoding RPC PDU */ char *encodebuf; @@ -98,7 +98,7 @@ struct rpc_context { struct rpc_pdu { struct rpc_pdu *next; - unsigned long xid; + uint32_t xid; ZDR zdr; uint32_t written; diff --git a/lib/pdu.c b/lib/pdu.c index eca054c..8de51d2 100644 --- a/lib/pdu.c +++ b/lib/pdu.c @@ -230,7 +230,7 @@ int rpc_process_pdu(struct rpc_context *rpc, char *buf, int size) struct rpc_pdu *pdu; ZDR zdr; int pos, recordmarker = 0; - unsigned int xid; + uint32_t xid; char *reasbuf = NULL; assert(rpc->magic == RPC_CONTEXT_MAGIC);