From: Ronnie Sahlberg Date: Sat, 5 Jul 2014 15:45:45 +0000 (-0700) Subject: RPC: get rid of all references to CLIENT X-Git-Tag: upstream/1.9.6^2~23^2~3 X-Git-Url: https://git.piment-noir.org/?p=deb_libnfs.git;a=commitdiff_plain;h=ef1f869943d9d6a19d4b2c21059fc9c0b2632a09 RPC: get rid of all references to CLIENT Signed-off-by: Ronnie Sahlberg --- diff --git a/mount/Makefile.am b/mount/Makefile.am index de7fdbd..3feed61 100644 --- a/mount/Makefile.am +++ b/mount/Makefile.am @@ -19,6 +19,6 @@ mount-stamp : mount.x compile_rpc: cat mount.x | head -29 >libnfs-raw-mount.h - rpcgen -h mount.x | sed -e "s/#include //" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" >> libnfs-raw-mount.h + rpcgen -h mount.x | sed -e "s/#include //" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" >> libnfs-raw-mount.h cat mount.x | head -29 >libnfs-raw-mount.c rpcgen -c mount.x | sed -e "s/#include \".*mount.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-mount.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" >> libnfs-raw-mount.c diff --git a/mount/libnfs-raw-mount.h b/mount/libnfs-raw-mount.h index 9f07d31..5be5bff 100644 --- a/mount/libnfs-raw-mount.h +++ b/mount/libnfs-raw-mount.h @@ -147,22 +147,22 @@ typedef struct mountres1 mountres1; #if defined(__STDC__) || defined(__cplusplus) #define MOUNT1_NULL 0 -extern void * mount1_null_1(void *, CLIENT *); +extern void * mount1_null_1(void *, void *); extern void * mount1_null_1_svc(void *, struct svc_req *); #define MOUNT1_MNT 1 -extern mountres1 * mount1_mnt_1(dirpath *, CLIENT *); +extern mountres1 * mount1_mnt_1(dirpath *, void *); extern mountres1 * mount1_mnt_1_svc(dirpath *, struct svc_req *); #define MOUNT1_DUMP 2 -extern mountlist * mount1_dump_1(void *, CLIENT *); +extern mountlist * mount1_dump_1(void *, void *); extern mountlist * mount1_dump_1_svc(void *, struct svc_req *); #define MOUNT1_UMNT 3 -extern void * mount1_umnt_1(dirpath *, CLIENT *); +extern void * mount1_umnt_1(dirpath *, void *); extern void * mount1_umnt_1_svc(dirpath *, struct svc_req *); #define MOUNT1_UMNTALL 4 -extern void * mount1_umntall_1(void *, CLIENT *); +extern void * mount1_umntall_1(void *, void *); extern void * mount1_umntall_1_svc(void *, struct svc_req *); #define MOUNT1_EXPORT 5 -extern exports * mount1_export_1(void *, CLIENT *); +extern exports * mount1_export_1(void *, void *); extern exports * mount1_export_1_svc(void *, struct svc_req *); extern int mount_program_1_freeresult (SVCXPRT *, zdrproc_t, caddr_t); @@ -191,22 +191,22 @@ extern int mount_program_1_freeresult (); #if defined(__STDC__) || defined(__cplusplus) #define MOUNT3_NULL 0 -extern void * mount3_null_3(void *, CLIENT *); +extern void * mount3_null_3(void *, void *); extern void * mount3_null_3_svc(void *, struct svc_req *); #define MOUNT3_MNT 1 -extern mountres3 * mount3_mnt_3(dirpath *, CLIENT *); +extern mountres3 * mount3_mnt_3(dirpath *, void *); extern mountres3 * mount3_mnt_3_svc(dirpath *, struct svc_req *); #define MOUNT3_DUMP 2 -extern mountlist * mount3_dump_3(void *, CLIENT *); +extern mountlist * mount3_dump_3(void *, void *); extern mountlist * mount3_dump_3_svc(void *, struct svc_req *); #define MOUNT3_UMNT 3 -extern void * mount3_umnt_3(dirpath *, CLIENT *); +extern void * mount3_umnt_3(dirpath *, void *); extern void * mount3_umnt_3_svc(dirpath *, struct svc_req *); #define MOUNT3_UMNTALL 4 -extern void * mount3_umntall_3(void *, CLIENT *); +extern void * mount3_umntall_3(void *, void *); extern void * mount3_umntall_3_svc(void *, struct svc_req *); #define MOUNT3_EXPORT 5 -extern exports * mount3_export_3(void *, CLIENT *); +extern exports * mount3_export_3(void *, void *); extern exports * mount3_export_3_svc(void *, struct svc_req *); extern int mount_program_3_freeresult (SVCXPRT *, zdrproc_t, caddr_t); diff --git a/nfs/Makefile.am b/nfs/Makefile.am index 2177519..ed4a2b7 100644 --- a/nfs/Makefile.am +++ b/nfs/Makefile.am @@ -19,6 +19,6 @@ nfs-stamp : nfs.x compile_rpc: cat nfs.x | head -29 >libnfs-raw-nfs.h - rpcgen -h nfs.x | sed -e "s/#include //" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/#define _NFS_H_RPCGEN/#define _NFS_H_RPCGEN\n#include /g" -e "s/#define NFS3_COOKIEVERFSIZE 8/#define NFS3_COOKIEVERFSIZE 8\n\n#if defined(ANDROID)\ntypedef long long int quad_t;\ntypedef long long unsigned u_quad_t;\n#endif\n#if defined(WIN32)\ntypedef long long int quad_t;\ntypedef long long unsigned u_quad_t;\n#endif/g" >> libnfs-raw-nfs.h + rpcgen -h nfs.x | sed -e "s/#include //" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/#define _NFS_H_RPCGEN/#define _NFS_H_RPCGEN\n#include /g" -e "s/#define NFS3_COOKIEVERFSIZE 8/#define NFS3_COOKIEVERFSIZE 8\n\n#if defined(ANDROID)\ntypedef long long int quad_t;\ntypedef long long unsigned u_quad_t;\n#endif\n#if defined(WIN32)\ntypedef long long int quad_t;\ntypedef long long unsigned u_quad_t;\n#endif/g" -e "s/ CLIENT / void /g" >> libnfs-raw-nfs.h cat nfs.x | head -29 >libnfs-raw-nfs.c rpcgen -c nfs.x | sed -e "s/#include \".*nfs.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nfs.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" >> libnfs-raw-nfs.c diff --git a/nfs/libnfs-raw-nfs.h b/nfs/libnfs-raw-nfs.h index 4b4c874..67649d7 100644 --- a/nfs/libnfs-raw-nfs.h +++ b/nfs/libnfs-raw-nfs.h @@ -1365,52 +1365,52 @@ typedef struct SETACL3res SETACL3res; #if defined(__STDC__) || defined(__cplusplus) #define NFS2_NULL 0 -extern void * nfs2_null_2(void *, CLIENT *); +extern void * nfs2_null_2(void *, void *); extern void * nfs2_null_2_svc(void *, struct svc_req *); #define NFS2_GETATTR 1 -extern GETATTR2res * nfs2_getattr_2(GETATTR2args *, CLIENT *); +extern GETATTR2res * nfs2_getattr_2(GETATTR2args *, void *); extern GETATTR2res * nfs2_getattr_2_svc(GETATTR2args *, struct svc_req *); #define NFS2_SETATTR 2 -extern SETATTR2res * nfs2_setattr_2(SETATTR2args *, CLIENT *); +extern SETATTR2res * nfs2_setattr_2(SETATTR2args *, void *); extern SETATTR2res * nfs2_setattr_2_svc(SETATTR2args *, struct svc_req *); #define NFS2_LOOKUP 4 -extern LOOKUP2res * nfs2_lookup_2(LOOKUP2args *, CLIENT *); +extern LOOKUP2res * nfs2_lookup_2(LOOKUP2args *, void *); extern LOOKUP2res * nfs2_lookup_2_svc(LOOKUP2args *, struct svc_req *); #define NFS2_READLINK 5 -extern READLINK2res * nfs2_readlink_2(READLINK2args *, CLIENT *); +extern READLINK2res * nfs2_readlink_2(READLINK2args *, void *); extern READLINK2res * nfs2_readlink_2_svc(READLINK2args *, struct svc_req *); #define NFS2_READ 6 -extern READ2res * nfs2_read_2(READ2args *, CLIENT *); +extern READ2res * nfs2_read_2(READ2args *, void *); extern READ2res * nfs2_read_2_svc(READ2args *, struct svc_req *); #define NFS2_WRITE 8 -extern WRITE2res * nfs2_write_2(WRITE2args *, CLIENT *); +extern WRITE2res * nfs2_write_2(WRITE2args *, void *); extern WRITE2res * nfs2_write_2_svc(WRITE2args *, struct svc_req *); #define NFS2_CREATE 9 -extern CREATE2res * nfs2_create_2(CREATE2args *, CLIENT *); +extern CREATE2res * nfs2_create_2(CREATE2args *, void *); extern CREATE2res * nfs2_create_2_svc(CREATE2args *, struct svc_req *); #define NFS2_REMOVE 10 -extern REMOVE2res * nfs2_remove_2(REMOVE2args *, CLIENT *); +extern REMOVE2res * nfs2_remove_2(REMOVE2args *, void *); extern REMOVE2res * nfs2_remove_2_svc(REMOVE2args *, struct svc_req *); #define NFS2_RENAME 11 -extern RENAME2res * nfs2_rename_2(RENAME2args *, CLIENT *); +extern RENAME2res * nfs2_rename_2(RENAME2args *, void *); extern RENAME2res * nfs2_rename_2_svc(RENAME2args *, struct svc_req *); #define NFS2_LINK 12 -extern LINK2res * nfs2_link_2(LINK2args *, CLIENT *); +extern LINK2res * nfs2_link_2(LINK2args *, void *); extern LINK2res * nfs2_link_2_svc(LINK2args *, struct svc_req *); #define NFS2_SYMLINK 13 -extern SYMLINK2res * nfs2_symlink_2(SYMLINK2args *, CLIENT *); +extern SYMLINK2res * nfs2_symlink_2(SYMLINK2args *, void *); extern SYMLINK2res * nfs2_symlink_2_svc(SYMLINK2args *, struct svc_req *); #define NFS2_MKDIR 14 -extern MKDIR2res * nfs2_mkdir_2(MKDIR2args *, CLIENT *); +extern MKDIR2res * nfs2_mkdir_2(MKDIR2args *, void *); extern MKDIR2res * nfs2_mkdir_2_svc(MKDIR2args *, struct svc_req *); #define NFS2_RMDIR 15 -extern RMDIR2res * nfs2_rmdir_2(RMDIR2args *, CLIENT *); +extern RMDIR2res * nfs2_rmdir_2(RMDIR2args *, void *); extern RMDIR2res * nfs2_rmdir_2_svc(RMDIR2args *, struct svc_req *); #define NFS2_READDIR 16 -extern READDIR2res * nfs2_readdir_2(READDIR2args *, CLIENT *); +extern READDIR2res * nfs2_readdir_2(READDIR2args *, void *); extern READDIR2res * nfs2_readdir_2_svc(READDIR2args *, struct svc_req *); #define NFS2_STATFS 17 -extern STATFS2res * nfs2_statfs_2(STATFS2args *, CLIENT *); +extern STATFS2res * nfs2_statfs_2(STATFS2args *, void *); extern STATFS2res * nfs2_statfs_2_svc(STATFS2args *, struct svc_req *); extern int nfs_program_2_freeresult (SVCXPRT *, zdrproc_t, caddr_t); @@ -1469,70 +1469,70 @@ extern int nfs_program_2_freeresult (); #if defined(__STDC__) || defined(__cplusplus) #define NFS3_NULL 0 -extern void * nfs3_null_3(void *, CLIENT *); +extern void * nfs3_null_3(void *, void *); extern void * nfs3_null_3_svc(void *, struct svc_req *); #define NFS3_GETATTR 1 -extern GETATTR3res * nfs3_getattr_3(GETATTR3args *, CLIENT *); +extern GETATTR3res * nfs3_getattr_3(GETATTR3args *, void *); extern GETATTR3res * nfs3_getattr_3_svc(GETATTR3args *, struct svc_req *); #define NFS3_SETATTR 2 -extern SETATTR3res * nfs3_setattr_3(SETATTR3args *, CLIENT *); +extern SETATTR3res * nfs3_setattr_3(SETATTR3args *, void *); extern SETATTR3res * nfs3_setattr_3_svc(SETATTR3args *, struct svc_req *); #define NFS3_LOOKUP 3 -extern LOOKUP3res * nfs3_lookup_3(LOOKUP3args *, CLIENT *); +extern LOOKUP3res * nfs3_lookup_3(LOOKUP3args *, void *); extern LOOKUP3res * nfs3_lookup_3_svc(LOOKUP3args *, struct svc_req *); #define NFS3_ACCESS 4 -extern ACCESS3res * nfs3_access_3(ACCESS3args *, CLIENT *); +extern ACCESS3res * nfs3_access_3(ACCESS3args *, void *); extern ACCESS3res * nfs3_access_3_svc(ACCESS3args *, struct svc_req *); #define NFS3_READLINK 5 -extern READLINK3res * nfs3_readlink_3(READLINK3args *, CLIENT *); +extern READLINK3res * nfs3_readlink_3(READLINK3args *, void *); extern READLINK3res * nfs3_readlink_3_svc(READLINK3args *, struct svc_req *); #define NFS3_READ 6 -extern READ3res * nfs3_read_3(READ3args *, CLIENT *); +extern READ3res * nfs3_read_3(READ3args *, void *); extern READ3res * nfs3_read_3_svc(READ3args *, struct svc_req *); #define NFS3_WRITE 7 -extern WRITE3res * nfs3_write_3(WRITE3args *, CLIENT *); +extern WRITE3res * nfs3_write_3(WRITE3args *, void *); extern WRITE3res * nfs3_write_3_svc(WRITE3args *, struct svc_req *); #define NFS3_CREATE 8 -extern CREATE3res * nfs3_create_3(CREATE3args *, CLIENT *); +extern CREATE3res * nfs3_create_3(CREATE3args *, void *); extern CREATE3res * nfs3_create_3_svc(CREATE3args *, struct svc_req *); #define NFS3_MKDIR 9 -extern MKDIR3res * nfs3_mkdir_3(MKDIR3args *, CLIENT *); +extern MKDIR3res * nfs3_mkdir_3(MKDIR3args *, void *); extern MKDIR3res * nfs3_mkdir_3_svc(MKDIR3args *, struct svc_req *); #define NFS3_SYMLINK 10 -extern SYMLINK3res * nfs3_symlink_3(SYMLINK3args *, CLIENT *); +extern SYMLINK3res * nfs3_symlink_3(SYMLINK3args *, void *); extern SYMLINK3res * nfs3_symlink_3_svc(SYMLINK3args *, struct svc_req *); #define NFS3_MKNOD 11 -extern MKNOD3res * nfs3_mknod_3(MKNOD3args *, CLIENT *); +extern MKNOD3res * nfs3_mknod_3(MKNOD3args *, void *); extern MKNOD3res * nfs3_mknod_3_svc(MKNOD3args *, struct svc_req *); #define NFS3_REMOVE 12 -extern REMOVE3res * nfs3_remove_3(REMOVE3args *, CLIENT *); +extern REMOVE3res * nfs3_remove_3(REMOVE3args *, void *); extern REMOVE3res * nfs3_remove_3_svc(REMOVE3args *, struct svc_req *); #define NFS3_RMDIR 13 -extern RMDIR3res * nfs3_rmdir_3(RMDIR3args *, CLIENT *); +extern RMDIR3res * nfs3_rmdir_3(RMDIR3args *, void *); extern RMDIR3res * nfs3_rmdir_3_svc(RMDIR3args *, struct svc_req *); #define NFS3_RENAME 14 -extern RENAME3res * nfs3_rename_3(RENAME3args *, CLIENT *); +extern RENAME3res * nfs3_rename_3(RENAME3args *, void *); extern RENAME3res * nfs3_rename_3_svc(RENAME3args *, struct svc_req *); #define NFS3_LINK 15 -extern LINK3res * nfs3_link_3(LINK3args *, CLIENT *); +extern LINK3res * nfs3_link_3(LINK3args *, void *); extern LINK3res * nfs3_link_3_svc(LINK3args *, struct svc_req *); #define NFS3_READDIR 16 -extern READDIR3res * nfs3_readdir_3(READDIR3args *, CLIENT *); +extern READDIR3res * nfs3_readdir_3(READDIR3args *, void *); extern READDIR3res * nfs3_readdir_3_svc(READDIR3args *, struct svc_req *); #define NFS3_READDIRPLUS 17 -extern READDIRPLUS3res * nfs3_readdirplus_3(READDIRPLUS3args *, CLIENT *); +extern READDIRPLUS3res * nfs3_readdirplus_3(READDIRPLUS3args *, void *); extern READDIRPLUS3res * nfs3_readdirplus_3_svc(READDIRPLUS3args *, struct svc_req *); #define NFS3_FSSTAT 18 -extern FSSTAT3res * nfs3_fsstat_3(FSSTAT3args *, CLIENT *); +extern FSSTAT3res * nfs3_fsstat_3(FSSTAT3args *, void *); extern FSSTAT3res * nfs3_fsstat_3_svc(FSSTAT3args *, struct svc_req *); #define NFS3_FSINFO 19 -extern FSINFO3res * nfs3_fsinfo_3(FSINFO3args *, CLIENT *); +extern FSINFO3res * nfs3_fsinfo_3(FSINFO3args *, void *); extern FSINFO3res * nfs3_fsinfo_3_svc(FSINFO3args *, struct svc_req *); #define NFS3_PATHCONF 20 -extern PATHCONF3res * nfs3_pathconf_3(PATHCONF3args *, CLIENT *); +extern PATHCONF3res * nfs3_pathconf_3(PATHCONF3args *, void *); extern PATHCONF3res * nfs3_pathconf_3_svc(PATHCONF3args *, struct svc_req *); #define NFS3_COMMIT 21 -extern COMMIT3res * nfs3_commit_3(COMMIT3args *, CLIENT *); +extern COMMIT3res * nfs3_commit_3(COMMIT3args *, void *); extern COMMIT3res * nfs3_commit_3_svc(COMMIT3args *, struct svc_req *); extern int nfs_program_3_freeresult (SVCXPRT *, zdrproc_t, caddr_t); @@ -1611,13 +1611,13 @@ extern int nfs_program_3_freeresult (); #if defined(__STDC__) || defined(__cplusplus) #define NFSACL3_NULL 0 -extern void * nfsacl3_null_3(void *, CLIENT *); +extern void * nfsacl3_null_3(void *, void *); extern void * nfsacl3_null_3_svc(void *, struct svc_req *); #define NFSACL3_GETACL 1 -extern GETACL3res * nfsacl3_getacl_3(GETACL3args *, CLIENT *); +extern GETACL3res * nfsacl3_getacl_3(GETACL3args *, void *); extern GETACL3res * nfsacl3_getacl_3_svc(GETACL3args *, struct svc_req *); #define NFSACL3_SETACL 2 -extern SETACL3res * nfsacl3_setacl_3(SETACL3args *, CLIENT *); +extern SETACL3res * nfsacl3_setacl_3(SETACL3args *, void *); extern SETACL3res * nfsacl3_setacl_3_svc(SETACL3args *, struct svc_req *); extern int nfsacl_program_3_freeresult (SVCXPRT *, zdrproc_t, caddr_t); diff --git a/nlm/Makefile.am b/nlm/Makefile.am index 0cc563d..b76d012 100644 --- a/nlm/Makefile.am +++ b/nlm/Makefile.am @@ -19,6 +19,6 @@ nlm-stamp : nlm.x compile_rpc: cat nlm.x | head -29 >libnfs-raw-nlm.h - rpcgen -h nlm.x | sed -e "s/#include //" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" >> libnfs-raw-nlm.h + rpcgen -h nlm.x | sed -e "s/#include //" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" >> libnfs-raw-nlm.h cat nlm.x | head -29 >libnfs-raw-nlm.c rpcgen -c nlm.x | sed -e "s/#include \".*nlm.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nlm.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" >> libnfs-raw-nlm.c diff --git a/nlm/libnfs-raw-nlm.h b/nlm/libnfs-raw-nlm.h index eb73c1a..30f8530 100644 --- a/nlm/libnfs-raw-nlm.h +++ b/nlm/libnfs-raw-nlm.h @@ -190,52 +190,52 @@ 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); diff --git a/nsm/Makefile.am b/nsm/Makefile.am index 3bf06a8..502c0ba 100644 --- a/nsm/Makefile.am +++ b/nsm/Makefile.am @@ -19,6 +19,6 @@ nsm-stamp : nsm.x compile_rpc: cat nsm.x | head -29 >libnfs-raw-nsm.h - rpcgen -h nsm.x | sed -e "s/#include //" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" >> libnfs-raw-nsm.h + rpcgen -h nsm.x | sed -e "s/#include //" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" >> libnfs-raw-nsm.h cat nsm.x | head -29 >libnfs-raw-nsm.c rpcgen -c nsm.x | sed -e "s/#include \".*nsm.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nsm.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" >> libnfs-raw-nsm.c diff --git a/nsm/libnfs-raw-nsm.h b/nsm/libnfs-raw-nsm.h index d656f3f..e4416c9 100644 --- a/nsm/libnfs-raw-nsm.h +++ b/nsm/libnfs-raw-nsm.h @@ -118,25 +118,25 @@ typedef struct NSM1_NOTIFYargs NSM1_NOTIFYargs; #if defined(__STDC__) || defined(__cplusplus) #define NSM1_NULL 0 -extern void * nsm1_null_1(void *, CLIENT *); +extern void * nsm1_null_1(void *, void *); extern void * nsm1_null_1_svc(void *, struct svc_req *); #define NSM1_STAT 1 -extern struct NSM1_STATres * nsm1_stat_1(struct NSM1_STATargs *, CLIENT *); +extern struct NSM1_STATres * nsm1_stat_1(struct NSM1_STATargs *, void *); extern struct NSM1_STATres * nsm1_stat_1_svc(struct NSM1_STATargs *, struct svc_req *); #define NSM1_MON 2 -extern struct NSM1_MONres * nsm1_mon_1(struct NSM1_MONargs *, CLIENT *); +extern struct NSM1_MONres * nsm1_mon_1(struct NSM1_MONargs *, void *); extern struct NSM1_MONres * nsm1_mon_1_svc(struct NSM1_MONargs *, struct svc_req *); #define NSM1_UNMON 3 -extern struct NSM1_UNMONres * nsm1_unmon_1(struct NSM1_UNMONargs *, CLIENT *); +extern struct NSM1_UNMONres * nsm1_unmon_1(struct NSM1_UNMONargs *, void *); extern struct NSM1_UNMONres * nsm1_unmon_1_svc(struct NSM1_UNMONargs *, struct svc_req *); #define NSM1_UNMON_ALL 4 -extern struct NSM1_UNMONALLres * nsm1_unmon_all_1(struct NSM1_UNMONALLargs *, CLIENT *); +extern struct NSM1_UNMONALLres * nsm1_unmon_all_1(struct NSM1_UNMONALLargs *, void *); extern struct NSM1_UNMONALLres * nsm1_unmon_all_1_svc(struct NSM1_UNMONALLargs *, struct svc_req *); #define NSM1_SIMU_CRASH 5 -extern void * nsm1_simu_crash_1(void *, CLIENT *); +extern void * nsm1_simu_crash_1(void *, void *); extern void * nsm1_simu_crash_1_svc(void *, struct svc_req *); #define NSM1_NOTIFY 6 -extern void * nsm1_notify_1(struct NSM1_NOTIFYargs *, CLIENT *); +extern void * nsm1_notify_1(struct NSM1_NOTIFYargs *, void *); extern void * nsm1_notify_1_svc(struct NSM1_NOTIFYargs *, struct svc_req *); extern int nsm_program_1_freeresult (SVCXPRT *, zdrproc_t, caddr_t); diff --git a/portmap/Makefile.am b/portmap/Makefile.am index 682ca2a..b5b8abb 100644 --- a/portmap/Makefile.am +++ b/portmap/Makefile.am @@ -19,6 +19,6 @@ portmap-stamp : portmap.x compile_rpc: cat portmap.x | head -29 >libnfs-raw-portmap.h - rpcgen -h portmap.x | sed -e "s/#include //" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" >> libnfs-raw-portmap.h + rpcgen -h portmap.x | sed -e "s/#include //" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" >> libnfs-raw-portmap.h cat portmap.x | head -29 >libnfs-raw-portmap.c rpcgen -c portmap.x | sed -e "s/#include \".*portmap.h\"/#include \"libnfs-zdr.h\"\n#include \"libnfs-raw-portmap.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" >> libnfs-raw-portmap.c diff --git a/portmap/libnfs-raw-portmap.h b/portmap/libnfs-raw-portmap.h index 676be5e..30135ea 100644 --- a/portmap/libnfs-raw-portmap.h +++ b/portmap/libnfs-raw-portmap.h @@ -142,22 +142,22 @@ typedef struct pmap3_netbuf pmap3_netbuf; #if defined(__STDC__) || defined(__cplusplus) #define PMAP2_NULL 0 -extern void * pmap2_null_2(void *, CLIENT *); +extern void * pmap2_null_2(void *, void *); extern void * pmap2_null_2_svc(void *, struct svc_req *); #define PMAP2_SET 1 -extern bool_t * pmap2_set_2(pmap2_mapping *, CLIENT *); +extern bool_t * pmap2_set_2(pmap2_mapping *, void *); extern bool_t * pmap2_set_2_svc(pmap2_mapping *, struct svc_req *); #define PMAP2_UNSET 2 -extern bool_t * pmap2_unset_2(pmap2_mapping *, CLIENT *); +extern bool_t * pmap2_unset_2(pmap2_mapping *, void *); extern bool_t * pmap2_unset_2_svc(pmap2_mapping *, struct svc_req *); #define PMAP2_GETPORT 3 -extern u_int * pmap2_getport_2(pmap2_mapping *, CLIENT *); +extern u_int * pmap2_getport_2(pmap2_mapping *, void *); extern u_int * pmap2_getport_2_svc(pmap2_mapping *, struct svc_req *); #define PMAP2_DUMP 4 -extern pmap2_dump_result * pmap2_dump_2(void *, CLIENT *); +extern pmap2_dump_result * pmap2_dump_2(void *, void *); extern pmap2_dump_result * pmap2_dump_2_svc(void *, struct svc_req *); #define PMAP2_CALLIT 5 -extern pmap2_call_result * pmap2_callit_2(pmap2_call_args *, CLIENT *); +extern pmap2_call_result * pmap2_callit_2(pmap2_call_args *, void *); extern pmap2_call_result * pmap2_callit_2_svc(pmap2_call_args *, struct svc_req *); extern int pmap_program_2_freeresult (SVCXPRT *, zdrproc_t, caddr_t); @@ -186,31 +186,31 @@ extern int pmap_program_2_freeresult (); #if defined(__STDC__) || defined(__cplusplus) #define PMAP3_NULL 0 -extern void * pmap3_null_3(void *, CLIENT *); +extern void * pmap3_null_3(void *, void *); extern void * pmap3_null_3_svc(void *, struct svc_req *); #define PMAP3_SET 1 -extern bool_t * pmap3_set_3(pmap3_mapping *, CLIENT *); +extern bool_t * pmap3_set_3(pmap3_mapping *, void *); extern bool_t * pmap3_set_3_svc(pmap3_mapping *, struct svc_req *); #define PMAP3_UNSET 2 -extern bool_t * pmap3_unset_3(pmap3_mapping *, CLIENT *); +extern bool_t * pmap3_unset_3(pmap3_mapping *, void *); extern bool_t * pmap3_unset_3_svc(pmap3_mapping *, struct svc_req *); #define PMAP3_GETADDR 3 -extern pmap3_string_result * pmap3_getaddr_3(pmap3_mapping *, CLIENT *); +extern pmap3_string_result * pmap3_getaddr_3(pmap3_mapping *, void *); extern pmap3_string_result * pmap3_getaddr_3_svc(pmap3_mapping *, struct svc_req *); #define PMAP3_DUMP 4 -extern pmap3_dump_result * pmap3_dump_3(void *, CLIENT *); +extern pmap3_dump_result * pmap3_dump_3(void *, void *); extern pmap3_dump_result * pmap3_dump_3_svc(void *, struct svc_req *); #define PMAP3_CALLIT 5 -extern pmap3_call_result * pmap3_callit_3(pmap3_call_args *, CLIENT *); +extern pmap3_call_result * pmap3_callit_3(pmap3_call_args *, void *); extern pmap3_call_result * pmap3_callit_3_svc(pmap3_call_args *, struct svc_req *); #define PMAP3_GETTIME 6 -extern u_int * pmap3_gettime_3(void *, CLIENT *); +extern u_int * pmap3_gettime_3(void *, void *); extern u_int * pmap3_gettime_3_svc(void *, struct svc_req *); #define PMAP3_UADDR2TADDR 7 -extern pmap3_netbuf * pmap3_uaddr2taddr_3(char **, CLIENT *); +extern pmap3_netbuf * pmap3_uaddr2taddr_3(char **, void *); extern pmap3_netbuf * pmap3_uaddr2taddr_3_svc(char **, struct svc_req *); #define PMAP3_TADDR2UADDR 8 -extern struct pmap3_string_result * pmap3_taddr2uaddr_3(pmap3_netbuf *, CLIENT *); +extern struct pmap3_string_result * pmap3_taddr2uaddr_3(pmap3_netbuf *, void *); extern struct pmap3_string_result * pmap3_taddr2uaddr_3_svc(pmap3_netbuf *, struct svc_req *); extern int pmap_program_3_freeresult (SVCXPRT *, zdrproc_t, caddr_t); diff --git a/rquota/Makefile.am b/rquota/Makefile.am index 5a604a8..c502fd5 100644 --- a/rquota/Makefile.am +++ b/rquota/Makefile.am @@ -19,6 +19,6 @@ rquota-stamp : rquota.x compile_rpc: cat rquota.x | head -29 >libnfs-raw-rquota.h - rpcgen -h rquota.x | sed -e "s/#include //" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" >> libnfs-raw-rquota.h + rpcgen -h rquota.x | sed -e "s/#include //" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" >> libnfs-raw-rquota.h cat rquota.x | head -29 >libnfs-raw-rquota.c rpcgen -c rquota.x | sed -e "s/#include \".*rquota.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-rquota.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" >> libnfs-raw-rquota.c diff --git a/rquota/libnfs-raw-rquota.h b/rquota/libnfs-raw-rquota.h index ed5fcb9..8161b9c 100644 --- a/rquota/libnfs-raw-rquota.h +++ b/rquota/libnfs-raw-rquota.h @@ -99,13 +99,13 @@ typedef struct GETQUOTA1res GETQUOTA1res; #if defined(__STDC__) || defined(__cplusplus) #define RQUOTA1_NULL 0 -extern void * rquota1_null_1(void *, CLIENT *); +extern void * rquota1_null_1(void *, void *); extern void * rquota1_null_1_svc(void *, struct svc_req *); #define RQUOTA1_GETQUOTA 1 -extern GETQUOTA1res * rquota1_getquota_1(GETQUOTA1args *, CLIENT *); +extern GETQUOTA1res * rquota1_getquota_1(GETQUOTA1args *, void *); extern GETQUOTA1res * rquota1_getquota_1_svc(GETQUOTA1args *, struct svc_req *); #define RQUOTA1_GETACTIVEQUOTA 2 -extern GETQUOTA1res * rquota1_getactivequota_1(GETQUOTA1args *, CLIENT *); +extern GETQUOTA1res * rquota1_getactivequota_1(GETQUOTA1args *, void *); extern GETQUOTA1res * rquota1_getactivequota_1_svc(GETQUOTA1args *, struct svc_req *); extern int rquota_program_1_freeresult (SVCXPRT *, zdrproc_t, caddr_t); @@ -125,13 +125,13 @@ extern int rquota_program_1_freeresult (); #if defined(__STDC__) || defined(__cplusplus) #define RQUOTA2_NULL 0 -extern void * rquota2_null_2(void *, CLIENT *); +extern void * rquota2_null_2(void *, void *); extern void * rquota2_null_2_svc(void *, struct svc_req *); #define RQUOTA2_GETQUOTA 1 -extern GETQUOTA1res * rquota2_getquota_2(GETQUOTA2args *, CLIENT *); +extern GETQUOTA1res * rquota2_getquota_2(GETQUOTA2args *, void *); extern GETQUOTA1res * rquota2_getquota_2_svc(GETQUOTA2args *, struct svc_req *); #define RQUOTA2_GETACTIVEQUOTA 2 -extern GETQUOTA1res * rquota2_getactivequota_2(GETQUOTA2args *, CLIENT *); +extern GETQUOTA1res * rquota2_getactivequota_2(GETQUOTA2args *, void *); extern GETQUOTA1res * rquota2_getactivequota_2_svc(GETQUOTA2args *, struct svc_req *); extern int rquota_program_2_freeresult (SVCXPRT *, zdrproc_t, caddr_t);