* auth.h: Provide full prototype for xdr_des_block

	* auth_gssapi.h: Complete prototypes for
	_svcauth_gssapi_unset_names().

	* clnt.h: Prototype dispatch functions and all functions.

	* clnt_perror.c: Prototype static auth_errmsg().

	* clnt_raw.h clnt_tcp.c, clnt_udp.c: Provide prototypes to static
	functions and match dispatch table prototypes. control function
	takes void * instead of caddr_t.

	* pmap_rmt.c: Move prototype for resultproc_t to pmap_clnt.h.

	* rpc.h: get_myaddress returns int. Add prototypes for callrpc and
	getrpcport.

	* rpc_commondata.c (rpc_createerr): When initializing rpc_creaerr
	use RPC_SUCCESS instead of 0.

	* get_myaddress.c, rpc_dtablesize.c: Include gssrpc/rpc.h for
	prototype.

	* pmap_clnt.h, pmap_prot.h, pmap_rmt.h, rpc_msg.h: Full prototypes
	for all functions.

	* svc.c: Provide full prototype for static function.

	* svc.h: Prototypes for dispatch functions added. Flushed out
	prototypes for all functions missing prototypes. Added prototype
	for svcfd_create.

	* svc_auth.c: Prototypes for all functions referenced.

	* svc_auth.h: Prototype dispatch functions to svc_auth_ops.

	* svc_auth_any.c: Replace use of authany_wrap() with a new local
	function that matches svc_auth_ops dispatch table.

	* svc_simple.c: Provide prototype for static function
	universal. Fill in missing types of parameters to
	gssrpc_registerrpc.

	* svc_raw.c svc_tcp.c, svc_udp.c: Provide prototypes for static
	functions and match prototypes in dispatch table. Change getargs
	and freeargs argument to void * from caddr_t.

	* xdr.c (xdr_void): Function to match prototype of arguments given.

	* xdr.h: Provide full prototypes for xdr_ops dispatch table and
	xdr_void().

	* svc_auth_gssapi.c, xdr_alloc.c, xdr_mem.c, xdr_rec.c,
	xdr_stdio.c: Provide protypes for static functions and match
	dispatch tables.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13528 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 34 insertions, 24 deletions

diff --git a/src/lib/rpc/clnt.h b/src/lib/rpc/clnt.h
index f308dd9996..ccdbe1c222 100644
--- a/src/lib/rpc/clnt.h
+++ b/src/lib/rpc/clnt.h
@@ -110,15 +110,27 @@ struct rpc_err {
  * Created by individual implementations, see e.g. rpc_udp.c.
  * Client is responsible for initializing auth, see e.g. auth_none.c.
  */
-typedef struct {
+typedef struct __rpc_client {
 	AUTH	*cl_auth;			/* authenticator */
 	struct clnt_ops {
-		enum clnt_stat	(*cl_call)();	/* call remote procedure */
-		void		(*cl_abort)();	/* abort a call */
-		void		(*cl_geterr)();	/* get specific error code */
-		bool_t		(*cl_freeres)(); /* frees results */
-		void		(*cl_destroy)();/* destroy this structure */
-		bool_t          (*cl_control)();/* the ioctl() of rpc */
+	        /* call remote procedure */
+	        enum clnt_stat	(*cl_call)(struct __rpc_client *,
+					   rpc_u_int32, xdrproc_t, void *,
+					   xdrproc_t, void *, 
+					   struct timeval);	
+                /* abort a call */
+		void		(*cl_abort)(struct __rpc_client *);	
+                /* get specific error code */
+		void		(*cl_geterr)(struct __rpc_client *, 
+					     struct rpc_err *);	
+                /* frees results */
+		bool_t		(*cl_freeres)(struct __rpc_client *,
+					      xdrproc_t, void *);
+                /* destroy this structure */
+		void		(*cl_destroy)(struct __rpc_client *);
+                /* the ioctl() of rpc */
+		bool_t          (*cl_control)(struct __rpc_client *, int,
+					      void *);
 	} *cl_ops;
 	caddr_t			cl_private;	/* private stuff */
 } CLIENT;
@@ -240,7 +252,7 @@ typedef struct {
  *	rpc_u_int32 vers;
  */
 #define clntraw_create	gssrpc_clntraw_create
-extern CLIENT *clntraw_create();
+extern CLIENT *clntraw_create(rpc_u_int32, rpc_u_int32);
 
 
 /*
@@ -248,13 +260,7 @@ extern CLIENT *clntraw_create();
  */
 #define clnt_create	gssrpc_clnt_create
 extern CLIENT *
-clnt_create(/*host, prog, vers, prot*/); /*
-	char *host; 	-- hostname
-	rpc_u_int32 prog;	-- program number
-	rpc_u_int32 vers;	-- version number
-	char *prot;	-- protocol
-*/
-
+clnt_create(char *, rpc_u_int32, rpc_u_int32, char *);
 
 
 
@@ -270,7 +276,8 @@ clnt_create(/*host, prog, vers, prot*/); /*
  *	unsigned int recvsz;
  */
 #define clnttcp_create	gssrpc_clnttcp_create
-extern CLIENT *clnttcp_create();
+extern CLIENT *clnttcp_create(struct sockaddr_in *, rpc_u_int32, rpc_u_int32,
+			      int *, unsigned int, unsigned int);
 
 /*
  * UDP based rpc.
@@ -295,8 +302,11 @@ extern CLIENT *clnttcp_create();
  */
 #define clntudp_create		gssrpc_clntudp_create
 #define clntudp_bufcreate	gssrpc_clntudp_bufcreate
-extern CLIENT *clntudp_create();
-extern CLIENT *clntudp_bufcreate();
+extern CLIENT *clntudp_create(struct sockaddr_in *, rpc_u_int32, 
+			      rpc_u_int32, struct timeval, int *);
+extern CLIENT *clntudp_bufcreate(struct sockaddr_in *, rpc_u_int32, 
+				 rpc_u_int32, struct timeval, int *,
+				 unsigned int, unsigned int);
 
 #define _rpc_dtablesize _gssrpc_rpc_dtablesize
 extern int _rpc_dtablesize(void);
@@ -305,22 +315,22 @@ extern int _rpc_dtablesize(void);
  */
 #define clnt_pcreateerror	gssrpc_clnt_pcreateerror
 #define clnt_spcreateerror	gssrpc_clnt_spcreateerror
-void clnt_pcreateerror(/* char *msg */);	/* stderr */
-char *clnt_spcreateerror(/* char *msg */);	/* string */
+void clnt_pcreateerror(char *);	/* stderr */
+char *clnt_spcreateerror(char *);	/* string */
 
 /*
  * Like clnt_perror(), but is more verbose in its output
  */ 
 #define clnt_perrno		gssrpc_clnt_perrno
-void clnt_perrno(/* enum clnt_stat num */);	/* stderr */
+void clnt_perrno(enum clnt_stat num);	/* stderr */
 
 /*
  * Print an English error message, given the client error code
  */
 #define clnt_perror		gssrpc_clnt_perror
 #define clnt_sperror		gssrpc_clnt_sperror
-void clnt_perror(/* CLIENT *clnt, char *msg */); 	/* stderr */
-char *clnt_sperror(/* CLIENT *clnt, char *msg */);	/* string */
+void clnt_perror(CLIENT *, char *); 	/* stderr */
+char *clnt_sperror(CLIENT *, char *);	/* string */
 
 /* 
  * If a creation fails, the following allows the user to figure out why.
@@ -339,7 +349,7 @@ extern struct rpc_createerr rpc_createerr;
  * Copy error message to buffer.
  */
 #define clnt_sperrno		gssrpc_clnt_sperrno
-char *clnt_sperrno(/* enum clnt_stat num */);	/* string */
+char *clnt_sperrno(enum clnt_stat num);	/* string */
 
 #define UDPMSGSIZE	8800	/* rpc imposed limit on udp msg size */
 #define RPCSMALLMSGSIZE	400	/* a more reasonable packet size */