summaryrefslogtreecommitdiff
path: root/include/rpc
diff options
context:
space:
mode:
Diffstat (limited to 'include/rpc')
-rw-r--r--include/rpc/auth.h9
-rw-r--r--include/rpc/clnt.h42
-rw-r--r--include/rpc/pmap_clnt.h22
-rw-r--r--include/rpc/rpc.h10
-rw-r--r--include/rpc/svc.h21
-rw-r--r--include/rpc/xdr.h8
6 files changed, 47 insertions, 65 deletions
diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index 7787659b9d0..fc983083b47 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.h,v 1.3 2002/02/16 21:27:18 millert Exp $ */
+/* $OpenBSD: auth.h,v 1.4 2002/02/17 19:42:21 millert Exp $ */
/* $NetBSD: auth.h,v 1.7 1995/04/29 05:27:55 cgd Exp $ */
/*
@@ -106,8 +106,8 @@ typedef struct __rpc_auth {
/* nextverf & serialize */
int (*ah_marshal)(struct __rpc_auth *, XDR *);
/* validate varifier */
- int (*ah_validate) __P((struct __rpc_auth *,
- struct opaque_auth *));
+ int (*ah_validate)(struct __rpc_auth *,
+ struct opaque_auth *);
/* refresh credentials */
int (*ah_refresh)(struct __rpc_auth *);
/* destroy this structure */
@@ -172,8 +172,7 @@ struct sockaddr_in;
extern AUTH *authunix_create(char *, int, int, int, int *);
extern AUTH *authunix_create_default(void);
extern AUTH *authnone_create(void);
-extern AUTH *authdes_create __P((char *, u_int,
- struct sockaddr_in *, des_block *));
+extern AUTH *authdes_create(char *, u_int, struct sockaddr_in *, des_block *);
__END_DECLS
#define AUTH_NONE 0 /* no authentication */
diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h
index 93c9b78350a..46b402711b7 100644
--- a/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: clnt.h,v 1.6 2002/02/16 21:27:18 millert Exp $ */
+/* $OpenBSD: clnt.h,v 1.7 2002/02/17 19:42:21 millert Exp $ */
/* $NetBSD: clnt.h,v 1.6 1995/04/29 05:27:58 cgd Exp $ */
/*
@@ -120,22 +120,22 @@ typedef struct __rpc_client {
AUTH *cl_auth; /* authenticator */
struct clnt_ops {
/* call remote procedure */
- enum clnt_stat (*cl_call) __P((struct __rpc_client *,
+ enum clnt_stat (*cl_call)(struct __rpc_client *,
u_long, xdrproc_t, caddr_t, xdrproc_t,
- caddr_t, struct timeval));
+ caddr_t, struct timeval);
/* abort a call */
void (*cl_abort)(struct __rpc_client *);
/* get specific error code */
- void (*cl_geterr) __P((struct __rpc_client *,
- struct rpc_err *));
+ void (*cl_geterr)(struct __rpc_client *,
+ struct rpc_err *);
/* frees results */
- bool_t (*cl_freeres) __P((struct __rpc_client *,
- xdrproc_t, caddr_t));
+ bool_t (*cl_freeres)(struct __rpc_client *,
+ xdrproc_t, caddr_t);
/* destroy this structure */
void (*cl_destroy)(struct __rpc_client *);
/* the ioctl() of rpc */
- bool_t (*cl_control) __P((struct __rpc_client *, u_int,
- void *));
+ bool_t (*cl_control)(struct __rpc_client *, u_int,
+ void *);
} *cl_ops;
caddr_t cl_private; /* private stuff */
} CLIENT;
@@ -285,12 +285,8 @@ __END_DECLS
* u_int recvsz;
*/
__BEGIN_DECLS
-extern CLIENT *clnttcp_create __P((struct sockaddr_in *,
- u_long,
- u_long,
- int *,
- u_int,
- u_int));
+extern CLIENT *clnttcp_create(struct sockaddr_in *, u_long, u_long, int *,
+ u_int, u_int);
__END_DECLS
@@ -316,18 +312,10 @@ __END_DECLS
* u_int recvsz;
*/
__BEGIN_DECLS
-extern CLIENT *clntudp_create __P((struct sockaddr_in *,
- u_long,
- u_long,
- struct timeval,
- int *));
-extern CLIENT *clntudp_bufcreate __P((struct sockaddr_in *,
- u_long,
- u_long,
- struct timeval,
- int *,
- u_int,
- u_int));
+extern CLIENT *clntudp_create(struct sockaddr_in *, u_long, u_long,
+ struct timeval, int *);
+extern CLIENT *clntudp_bufcreate(struct sockaddr_in *, u_long, u_long,
+ struct timeval, int *, u_int, u_int);
__END_DECLS
diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h
index 9e54c50243e..2a6fbecb355 100644
--- a/include/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap_clnt.h,v 1.4 2002/02/16 21:27:18 millert Exp $ */
+/* $OpenBSD: pmap_clnt.h,v 1.5 2002/02/17 19:42:21 millert Exp $ */
/* $NetBSD: pmap_clnt.h,v 1.5 1994/12/04 01:12:42 cgd Exp $ */
/*
@@ -70,18 +70,14 @@ __BEGIN_DECLS
extern bool_t pmap_set(u_long, u_long, u_int, int);
extern bool_t pmap_unset(u_long, u_long);
extern struct pmaplist *pmap_getmaps(struct sockaddr_in *);
-extern enum clnt_stat pmap_rmtcall __P((struct sockaddr_in *,
- u_long, u_long, u_long,
- xdrproc_t, caddr_t,
- xdrproc_t, caddr_t,
- struct timeval, u_long *));
-extern enum clnt_stat clnt_broadcast __P((u_long, u_long, u_long,
- xdrproc_t, char *,
- xdrproc_t, char *,
- bool_t (*) __P((caddr_t,
- struct sockaddr_in *))));
-extern u_short pmap_getport __P((struct sockaddr_in *,
- u_long, u_long, u_int));
+extern enum clnt_stat pmap_rmtcall(struct sockaddr_in *, u_long, u_long,
+ u_long, xdrproc_t, caddr_t, xdrproc_t, caddr_t,
+ struct timeval, u_long *);
+extern enum clnt_stat clnt_broadcast(u_long, u_long, u_long, xdrproc_t,
+ char *, xdrproc_t, char *,
+ bool_t (*)(caddr_t, struct sockaddr_in *));
+extern u_short pmap_getport(struct sockaddr_in *, u_long, u_long,
+ u_int);
__END_DECLS
#endif /* !_RPC_PMAPCLNT_H */
diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h
index 1d929e86a8c..fc9189f5fe5 100644
--- a/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rpc.h,v 1.9 2002/02/16 21:27:18 millert Exp $ */
+/* $OpenBSD: rpc.h,v 1.10 2002/02/17 19:42:21 millert Exp $ */
/* $NetBSD: rpc.h,v 1.5 1994/12/04 01:15:30 cgd Exp $ */
/*
@@ -93,10 +93,10 @@ extern void setrpcent(int);
extern void endrpcent(void);
extern int get_myaddress(struct sockaddr_in *);
-extern int registerrpc __P((int, int, int, char *(*)(char [UDPMSGSIZE]),
- xdrproc_t, xdrproc_t));
-extern int callrpc __P((char *, int, int, int, xdrproc_t, char *,
- xdrproc_t , char *));
+extern int registerrpc(int, int, int, char *(*)(char [UDPMSGSIZE]),
+ xdrproc_t, xdrproc_t);
+extern int callrpc(char *, int, int, int, xdrproc_t, char *,
+ xdrproc_t , char *);
extern int getrpcport(char *, int, int, int);
extern bool_t xdr_opaque_auth(XDR *, struct opaque_auth *);
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index be428e2f4ef..d41951bcbbf 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: svc.h,v 1.6 2002/02/16 21:27:18 millert Exp $ */
+/* $OpenBSD: svc.h,v 1.7 2002/02/17 19:42:21 millert Exp $ */
/* $NetBSD: svc.h,v 1.9 1995/04/29 05:28:01 cgd Exp $ */
/*
@@ -79,19 +79,18 @@ typedef struct __rpc_svcxprt {
u_short xp_port; /* associated port number */
struct xp_ops {
/* receive incomming requests */
- bool_t (*xp_recv) __P((struct __rpc_svcxprt *,
- struct rpc_msg *));
+ bool_t (*xp_recv)(struct __rpc_svcxprt *,
+ struct rpc_msg *);
/* get transport status */
enum xprt_stat (*xp_stat)(struct __rpc_svcxprt *);
/* get arguments */
- bool_t (*xp_getargs) __P((struct __rpc_svcxprt *, xdrproc_t,
- caddr_t));
+ bool_t (*xp_getargs)(struct __rpc_svcxprt *, xdrproc_t,
+ caddr_t);
/* send reply */
- bool_t (*xp_reply) __P((struct __rpc_svcxprt *,
- struct rpc_msg *));
+ bool_t (*xp_reply)(struct __rpc_svcxprt *, struct rpc_msg *);
/* free mem allocated for args */
- bool_t (*xp_freeargs) __P((struct __rpc_svcxprt *, xdrproc_t,
- caddr_t));
+ bool_t (*xp_freeargs)(struct __rpc_svcxprt *, xdrproc_t,
+ caddr_t);
/* destroy this struct */
void (*xp_destroy)(struct __rpc_svcxprt *);
} *xp_ops;
@@ -170,8 +169,8 @@ struct svc_req {
* int protocol; like TCP or UDP, zero means do not register
*/
__BEGIN_DECLS
-extern bool_t svc_register __P((SVCXPRT *, u_long, u_long,
- void (*)(struct svc_req *, SVCXPRT *), int));
+extern bool_t svc_register(SVCXPRT *, u_long, u_long,
+ void (*)(struct svc_req *, SVCXPRT *), int);
__END_DECLS
/*
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index 3b9076ea4ca..26731c04f3d 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: xdr.h,v 1.3 2002/02/16 21:27:18 millert Exp $ */
+/* $OpenBSD: xdr.h,v 1.4 2002/02/17 19:42:21 millert Exp $ */
/* $NetBSD: xdr.h,v 1.7 1995/04/29 05:28:06 cgd Exp $ */
/*
@@ -291,9 +291,9 @@ extern void xdrstdio_create(XDR *, FILE *, enum xdr_op);
#endif
/* XDR pseudo records for tcp */
-extern void xdrrec_create __P((XDR *, u_int, u_int, char *,
- int (*)(caddr_t, caddr_t, int),
- int (*)(caddr_t, caddr_t, int)));
+extern void xdrrec_create(XDR *, u_int, u_int, char *,
+ int (*)(caddr_t, caddr_t, int),
+ int (*)(caddr_t, caddr_t, int));
/* make end of xdr record */
extern bool_t xdrrec_endofrecord(XDR *, int);