X-Git-Url: https://git.piment-noir.org/?p=deb_libnfs.git;a=blobdiff_plain;f=nlm%2Flibnfs-raw-nlm.h;h=ce852598ef3bedf96a021c2f8d6ff6e3d95c2aaf;hp=eb73c1ac99bb3712bc4d5166336828c14feb58c0;hb=c76fd7199ffdf118c43357af72a29f56f245db04;hpb=f1f22dbf6222c4899b45d9c83ccf1b6314464869 diff --git a/nlm/libnfs-raw-nlm.h b/nlm/libnfs-raw-nlm.h index eb73c1a..ce85259 100644 --- a/nlm/libnfs-raw-nlm.h +++ b/nlm/libnfs-raw-nlm.h @@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project. #ifndef _NLM_H_RPCGEN #define _NLM_H_RPCGEN - +#include #ifdef __cplusplus @@ -76,7 +76,7 @@ enum nlmstat4 { typedef enum nlmstat4 nlmstat4; struct nlm4_holder { - bool_t exclusive; + uint32_t exclusive; u_int svid; nlm4_oh oh; u_quad_t l_offset; @@ -125,7 +125,7 @@ typedef struct NLM4_TESTres NLM4_TESTres; struct NLM4_TESTargs { nlm_cookie cookie; - bool_t exclusive; + uint32_t exclusive; nlm4_lock lock; }; typedef struct NLM4_TESTargs NLM4_TESTargs; @@ -138,8 +138,8 @@ typedef struct NLM4_CANCres NLM4_CANCres; struct NLM4_CANCargs { nlm_cookie cookie; - bool_t block; - bool_t exclusive; + uint32_t block; + uint32_t exclusive; nlm4_lock lock; }; typedef struct NLM4_CANCargs NLM4_CANCargs; @@ -164,17 +164,17 @@ typedef struct NLM4_LOCKres NLM4_LOCKres; struct NLM4_LOCKargs { nlm_cookie cookie; - bool_t block; - bool_t exclusive; + uint32_t block; + uint32_t exclusive; nlm4_lock lock; - bool_t reclaim; + uint32_t reclaim; int state; }; typedef struct NLM4_LOCKargs NLM4_LOCKargs; struct NLM4_GRANTEDargs { nlm_cookie cookie; - bool_t exclusive; + uint32_t exclusive; nlm4_lock lock; }; typedef struct NLM4_GRANTEDargs NLM4_GRANTEDargs; @@ -190,54 +190,54 @@ typedef struct NLM4_GRANTEDres NLM4_GRANTEDres; #if defined(__STDC__) || defined(__cplusplus) #define NLM4_NULL 0 -extern void * nlm4_null_4(void *, CLIENT *); +extern void * nlm4_null_4(void *, void *); extern void * nlm4_null_4_svc(void *, struct svc_req *); #define NLM4_TEST 1 -extern NLM4_TESTres * nlm4_test_4(NLM4_TESTargs *, CLIENT *); +extern NLM4_TESTres * nlm4_test_4(NLM4_TESTargs *, void *); extern NLM4_TESTres * nlm4_test_4_svc(NLM4_TESTargs *, struct svc_req *); #define NLM4_LOCK 2 -extern NLM4_LOCKres * nlm4_lock_4(NLM4_LOCKargs *, CLIENT *); +extern NLM4_LOCKres * nlm4_lock_4(NLM4_LOCKargs *, void *); extern NLM4_LOCKres * nlm4_lock_4_svc(NLM4_LOCKargs *, struct svc_req *); #define NLM4_CANCEL 3 -extern NLM4_CANCres * nlm4_cancel_4(NLM4_CANCargs *, CLIENT *); +extern NLM4_CANCres * nlm4_cancel_4(NLM4_CANCargs *, void *); extern NLM4_CANCres * nlm4_cancel_4_svc(NLM4_CANCargs *, struct svc_req *); #define NLM4_UNLOCK 4 -extern NLM4_UNLOCKres * nlm4_unlock_4(NLM4_UNLOCKargs *, CLIENT *); +extern NLM4_UNLOCKres * nlm4_unlock_4(NLM4_UNLOCKargs *, void *); extern NLM4_UNLOCKres * nlm4_unlock_4_svc(NLM4_UNLOCKargs *, struct svc_req *); #define NLM4_GRANT 5 -extern NLM4_GRANTEDres * nlm4_grant_4(NLM4_GRANTEDargs *, CLIENT *); +extern NLM4_GRANTEDres * nlm4_grant_4(NLM4_GRANTEDargs *, void *); extern NLM4_GRANTEDres * nlm4_grant_4_svc(NLM4_GRANTEDargs *, struct svc_req *); #define NLM4_TEST_MSG 6 -extern void * nlm4_test_msg_4(NLM4_TESTargs *, CLIENT *); +extern void * nlm4_test_msg_4(NLM4_TESTargs *, void *); extern void * nlm4_test_msg_4_svc(NLM4_TESTargs *, struct svc_req *); #define NLM4_LOCK_MSG 7 -extern void * nlm4_lock_msg_4(NLM4_LOCKargs *, CLIENT *); +extern void * nlm4_lock_msg_4(NLM4_LOCKargs *, void *); extern void * nlm4_lock_msg_4_svc(NLM4_LOCKargs *, struct svc_req *); #define NLM4_CANCEL_MSG 8 -extern void * nlm4_cancel_msg_4(NLM4_CANCargs *, CLIENT *); +extern void * nlm4_cancel_msg_4(NLM4_CANCargs *, void *); extern void * nlm4_cancel_msg_4_svc(NLM4_CANCargs *, struct svc_req *); #define NLM4_UNLOCK_MSG 9 -extern void * nlm4_unlock_msg_4(NLM4_UNLOCKargs *, CLIENT *); +extern void * nlm4_unlock_msg_4(NLM4_UNLOCKargs *, void *); extern void * nlm4_unlock_msg_4_svc(NLM4_UNLOCKargs *, struct svc_req *); #define NLM4_GRANT_MSG 10 -extern void * nlm4_grant_msg_4(NLM4_GRANTEDargs *, CLIENT *); +extern void * nlm4_grant_msg_4(NLM4_GRANTEDargs *, void *); extern void * nlm4_grant_msg_4_svc(NLM4_GRANTEDargs *, struct svc_req *); #define NLM4_TEST_RES 11 -extern void * nlm4_test_res_4(NLM4_TESTres *, CLIENT *); +extern void * nlm4_test_res_4(NLM4_TESTres *, void *); extern void * nlm4_test_res_4_svc(NLM4_TESTres *, struct svc_req *); #define NLM4_LOCK_RES 12 -extern void * nlm4_lock_res_4(NLM4_LOCKres *, CLIENT *); +extern void * nlm4_lock_res_4(NLM4_LOCKres *, void *); extern void * nlm4_lock_res_4_svc(NLM4_LOCKres *, struct svc_req *); #define NLM4_CANCEL_RES 13 -extern void * nlm4_cancel_res_4(NLM4_CANCres *, CLIENT *); +extern void * nlm4_cancel_res_4(NLM4_CANCres *, void *); extern void * nlm4_cancel_res_4_svc(NLM4_CANCres *, struct svc_req *); #define NLM4_UNLOCK_RES 14 -extern void * nlm4_unlock_res_4(NLM4_UNLOCKres *, CLIENT *); +extern void * nlm4_unlock_res_4(NLM4_UNLOCKres *, void *); extern void * nlm4_unlock_res_4_svc(NLM4_UNLOCKres *, struct svc_req *); #define NLM4_GRANT_RES 15 -extern void * nlm4_grant_res_4(NLM4_GRANTEDres *, CLIENT *); +extern void * nlm4_grant_res_4(NLM4_GRANTEDres *, void *); extern void * nlm4_grant_res_4_svc(NLM4_GRANTEDres *, struct svc_req *); -extern int nlm_program_4_freeresult (SVCXPRT *, zdrproc_t, caddr_t); +extern int nlm_program_4_freeresult (void *, zdrproc_t, caddr_t); #else /* K&R C */ #define NLM4_NULL 0 @@ -294,46 +294,46 @@ extern int nlm_program_4_freeresult (); /* the zdr functions */ #if defined(__STDC__) || defined(__cplusplus) -extern bool_t zdr_nlm_fh4 (ZDR *, nlm_fh4*); -extern bool_t zdr_nlm4_oh (ZDR *, nlm4_oh*); -extern bool_t zdr_nlm_cookie (ZDR *, nlm_cookie*); -extern bool_t zdr_nlmstat4 (ZDR *, nlmstat4*); -extern bool_t zdr_nlm4_holder (ZDR *, nlm4_holder*); -extern bool_t zdr_nlm4_lock (ZDR *, nlm4_lock*); -extern bool_t zdr_nlm4_share (ZDR *, nlm4_share*); -extern bool_t zdr_nlm4_testres_denied (ZDR *, nlm4_testres_denied*); -extern bool_t zdr_nlm4_testreply (ZDR *, nlm4_testreply*); -extern bool_t zdr_NLM4_TESTres (ZDR *, NLM4_TESTres*); -extern bool_t zdr_NLM4_TESTargs (ZDR *, NLM4_TESTargs*); -extern bool_t zdr_NLM4_CANCres (ZDR *, NLM4_CANCres*); -extern bool_t zdr_NLM4_CANCargs (ZDR *, NLM4_CANCargs*); -extern bool_t zdr_NLM4_UNLOCKres (ZDR *, NLM4_UNLOCKres*); -extern bool_t zdr_NLM4_UNLOCKargs (ZDR *, NLM4_UNLOCKargs*); -extern bool_t zdr_NLM4_LOCKres (ZDR *, NLM4_LOCKres*); -extern bool_t zdr_NLM4_LOCKargs (ZDR *, NLM4_LOCKargs*); -extern bool_t zdr_NLM4_GRANTEDargs (ZDR *, NLM4_GRANTEDargs*); -extern bool_t zdr_NLM4_GRANTEDres (ZDR *, NLM4_GRANTEDres*); +extern uint32_t zdr_nlm_fh4 (ZDR *, nlm_fh4*); +extern uint32_t zdr_nlm4_oh (ZDR *, nlm4_oh*); +extern uint32_t zdr_nlm_cookie (ZDR *, nlm_cookie*); +extern uint32_t zdr_nlmstat4 (ZDR *, nlmstat4*); +extern uint32_t zdr_nlm4_holder (ZDR *, nlm4_holder*); +extern uint32_t zdr_nlm4_lock (ZDR *, nlm4_lock*); +extern uint32_t zdr_nlm4_share (ZDR *, nlm4_share*); +extern uint32_t zdr_nlm4_testres_denied (ZDR *, nlm4_testres_denied*); +extern uint32_t zdr_nlm4_testreply (ZDR *, nlm4_testreply*); +extern uint32_t zdr_NLM4_TESTres (ZDR *, NLM4_TESTres*); +extern uint32_t zdr_NLM4_TESTargs (ZDR *, NLM4_TESTargs*); +extern uint32_t zdr_NLM4_CANCres (ZDR *, NLM4_CANCres*); +extern uint32_t zdr_NLM4_CANCargs (ZDR *, NLM4_CANCargs*); +extern uint32_t zdr_NLM4_UNLOCKres (ZDR *, NLM4_UNLOCKres*); +extern uint32_t zdr_NLM4_UNLOCKargs (ZDR *, NLM4_UNLOCKargs*); +extern uint32_t zdr_NLM4_LOCKres (ZDR *, NLM4_LOCKres*); +extern uint32_t zdr_NLM4_LOCKargs (ZDR *, NLM4_LOCKargs*); +extern uint32_t zdr_NLM4_GRANTEDargs (ZDR *, NLM4_GRANTEDargs*); +extern uint32_t zdr_NLM4_GRANTEDres (ZDR *, NLM4_GRANTEDres*); #else /* K&R C */ -extern bool_t zdr_nlm_fh4 (); -extern bool_t zdr_nlm4_oh (); -extern bool_t zdr_nlm_cookie (); -extern bool_t zdr_nlmstat4 (); -extern bool_t zdr_nlm4_holder (); -extern bool_t zdr_nlm4_lock (); -extern bool_t zdr_nlm4_share (); -extern bool_t zdr_nlm4_testres_denied (); -extern bool_t zdr_nlm4_testreply (); -extern bool_t zdr_NLM4_TESTres (); -extern bool_t zdr_NLM4_TESTargs (); -extern bool_t zdr_NLM4_CANCres (); -extern bool_t zdr_NLM4_CANCargs (); -extern bool_t zdr_NLM4_UNLOCKres (); -extern bool_t zdr_NLM4_UNLOCKargs (); -extern bool_t zdr_NLM4_LOCKres (); -extern bool_t zdr_NLM4_LOCKargs (); -extern bool_t zdr_NLM4_GRANTEDargs (); -extern bool_t zdr_NLM4_GRANTEDres (); +extern uint32_t zdr_nlm_fh4 (); +extern uint32_t zdr_nlm4_oh (); +extern uint32_t zdr_nlm_cookie (); +extern uint32_t zdr_nlmstat4 (); +extern uint32_t zdr_nlm4_holder (); +extern uint32_t zdr_nlm4_lock (); +extern uint32_t zdr_nlm4_share (); +extern uint32_t zdr_nlm4_testres_denied (); +extern uint32_t zdr_nlm4_testreply (); +extern uint32_t zdr_NLM4_TESTres (); +extern uint32_t zdr_NLM4_TESTargs (); +extern uint32_t zdr_NLM4_CANCres (); +extern uint32_t zdr_NLM4_CANCargs (); +extern uint32_t zdr_NLM4_UNLOCKres (); +extern uint32_t zdr_NLM4_UNLOCKargs (); +extern uint32_t zdr_NLM4_LOCKres (); +extern uint32_t zdr_NLM4_LOCKargs (); +extern uint32_t zdr_NLM4_GRANTEDargs (); +extern uint32_t zdr_NLM4_GRANTEDres (); #endif /* K&R C */