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 79ac411339668ffcb4e79d3edd00c95ed2b4f54c..328d79dc62720d45f2205bb61f9d1c3081fa0b30 100644 (file)
--- 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 eca054c658ecd20b7c52b3b41792e04991ab1218..8de51d2fb56025ea7750f84f7126afd5b412eb58 100644 (file)
--- 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);