RPC: get rid of references to SCVXPRT

Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>

diff --git a/mount/Makefile.am b/mount/Makefile.am
index 3feed61023d3a643c577f8d00829664ea262bc1a..13cbaf46f90e2a90a818b69a94e81dfe329c5221 100644 (file)
--- 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 <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" >> libnfs-raw-mount.h
+       rpcgen -h mount.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /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 5be5bff0af1b7e270e5f5b09287b0eda0d9ffe94..c6e40a25bd0bd3bff607300837af18631be17df4 100644 (file)
--- a/mount/libnfs-raw-mount.h
+++ b/mount/libnfs-raw-mount.h
@@ -164,7 +164,7 @@ extern  void * mount1_umntall_1_svc(void *, struct svc_req *);
 #define MOUNT1_EXPORT 5
 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);
+extern int mount_program_1_freeresult (void *, zdrproc_t, caddr_t);
 
 #else /* K&R C */
 #define MOUNT1_NULL 0
@@ -208,7 +208,7 @@ extern  void * mount3_umntall_3_svc(void *, struct svc_req *);
 #define MOUNT3_EXPORT 5
 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);
+extern int mount_program_3_freeresult (void *, zdrproc_t, caddr_t);
 
 #else /* K&R C */
 #define MOUNT3_NULL 0

diff --git a/nfs/Makefile.am b/nfs/Makefile.am
index ed4a2b7d0b69e6a439f75d1c26e2cc1a726257ba..c3bc2c5a0415d14f32b5d6ad13cc42a5525dca5d 100644 (file)
--- 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 <rpc\/rpc.h>//" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/#define _NFS_H_RPCGEN/#define _NFS_H_RPCGEN\n#include <nfsc\/libnfs-zdr.h>/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
+       rpcgen -h nfs.x | sed -e "s/#include <rpc\/rpc.h>//" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/#define _NFS_H_RPCGEN/#define _NFS_H_RPCGEN\n#include <nfsc\/libnfs-zdr.h>/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" -e "s/SVCXPRT /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 67649d73662425d0e76c6c88d563f5424977bc34..bdac7f48e36a5be9c17b48b7202ac1a7877e70fd 100644 (file)
--- a/nfs/libnfs-raw-nfs.h
+++ b/nfs/libnfs-raw-nfs.h
@@ -1412,7 +1412,7 @@ extern  READDIR2res * nfs2_readdir_2_svc(READDIR2args *, struct svc_req *);
 #define NFS2_STATFS 17
 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);
+extern int nfs_program_2_freeresult (void *, zdrproc_t, caddr_t);
 
 #else /* K&R C */
 #define NFS2_NULL 0
@@ -1534,7 +1534,7 @@ extern  PATHCONF3res * nfs3_pathconf_3_svc(PATHCONF3args *, struct svc_req *);
 #define NFS3_COMMIT 21
 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);
+extern int nfs_program_3_freeresult (void *, zdrproc_t, caddr_t);
 
 #else /* K&R C */
 #define NFS3_NULL 0
@@ -1619,7 +1619,7 @@ extern  GETACL3res * nfsacl3_getacl_3_svc(GETACL3args *, struct svc_req *);
 #define NFSACL3_SETACL 2
 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);
+extern int nfsacl_program_3_freeresult (void *, zdrproc_t, caddr_t);
 
 #else /* K&R C */
 #define NFSACL3_NULL 0

diff --git a/nlm/Makefile.am b/nlm/Makefile.am
index b76d012bf77b42a24fdff5840b48f8cbc5fcdcad..93b3c86d27f7e58294448e979c30ce752d8a324a 100644 (file)
--- 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 <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" >> libnfs-raw-nlm.h
+       rpcgen -h nlm.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /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 30f853067044c12569caebe0138850d1a20fc24a..08ee0c7d0c15fed795cfe25cc383f171c55fe49e 100644 (file)
--- a/nlm/libnfs-raw-nlm.h
+++ b/nlm/libnfs-raw-nlm.h
@@ -237,7 +237,7 @@ 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 *, 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

diff --git a/nsm/Makefile.am b/nsm/Makefile.am
index 502c0ba334dd75023f5108a98f9c752da97f7c66..16cc1f9839c145ef6981e977a7d57a469269ef67 100644 (file)
--- 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 <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" >> libnfs-raw-nsm.h
+       rpcgen -h nsm.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /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 e4416c997c9f394434e8f0ba5260576c59a641d8..613cd220ad162a329fc8df8b66eb18d73d08e10b 100644 (file)
--- a/nsm/libnfs-raw-nsm.h
+++ b/nsm/libnfs-raw-nsm.h
@@ -138,7 +138,7 @@ extern  void * nsm1_simu_crash_1_svc(void *, struct svc_req *);
 #define NSM1_NOTIFY 6
 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);
+extern int nsm_program_1_freeresult (void *, zdrproc_t, caddr_t);
 
 #else /* K&R C */
 #define NSM1_NULL 0

diff --git a/portmap/Makefile.am b/portmap/Makefile.am
index b5b8abb3905850127c668de19d966a2e22440a34..71801bd8ff7a3774b741fdc022d097a21afd50f9 100644 (file)
--- 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 <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" >> libnfs-raw-portmap.h
+       rpcgen -h portmap.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /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 30135eace96612fae985112692c739bc802b2822..e1915c5895639516fb8c9ae804efa94a6416e3df 100644 (file)
--- a/portmap/libnfs-raw-portmap.h
+++ b/portmap/libnfs-raw-portmap.h
@@ -159,7 +159,7 @@ 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 *, 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);
+extern int pmap_program_2_freeresult (void *, zdrproc_t, caddr_t);
 
 #else /* K&R C */
 #define PMAP2_NULL 0
@@ -212,7 +212,7 @@ 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 *, 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);
+extern int pmap_program_3_freeresult (void *, zdrproc_t, caddr_t);
 
 #else /* K&R C */
 #define PMAP3_NULL 0

diff --git a/rquota/Makefile.am b/rquota/Makefile.am
index c502fd57aa2e3954f7e33f2f49c3210853e03b8e..d80e83ef6143ef54277138f34a75aa86f463ee40 100644 (file)
--- 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 <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" >> libnfs-raw-rquota.h
+       rpcgen -h rquota.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /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 8161b9c0bafbade69077e99212d15d54223a946e..d5b1bd1d28fc7d87785238c22476116baad45d09 100644 (file)
--- a/rquota/libnfs-raw-rquota.h
+++ b/rquota/libnfs-raw-rquota.h
@@ -107,7 +107,7 @@ extern  GETQUOTA1res * rquota1_getquota_1_svc(GETQUOTA1args *, struct svc_req *)
 #define RQUOTA1_GETACTIVEQUOTA 2
 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);
+extern int rquota_program_1_freeresult (void *, zdrproc_t, caddr_t);
 
 #else /* K&R C */
 #define RQUOTA1_NULL 0
@@ -133,7 +133,7 @@ extern  GETQUOTA1res * rquota2_getquota_2_svc(GETQUOTA2args *, struct svc_req *)
 #define RQUOTA2_GETACTIVEQUOTA 2
 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);
+extern int rquota_program_2_freeresult (void *, zdrproc_t, caddr_t);
 
 #else /* K&R C */
 #define RQUOTA2_NULL 0