Sun Aug 10 06:51:38 2014 UTC ()
Rebase.


(tls)
diff -r1.21 -r1.21.18.1 src/include/rpc/clnt.h
cvs diff -r1.21 -r1.21.18.1 src/include/rpc/clnt.h (expand / switch to unified diff)

--- src/include/rpc/clnt.h 2011/08/30 17:06:20 1.21
+++ src/include/rpc/clnt.h 2014/08/10 06:51:38 1.21.18.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: clnt.h,v 1.21 2011/08/30 17:06:20 plunky Exp $ */ 1/* $NetBSD: clnt.h,v 1.21.18.1 2014/08/10 06:51:38 tls Exp $ */
2 2
3/* 3/*
4 * Sun RPC is a product of Sun Microsystems, Inc. and is provided for 4 * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
5 * unrestricted use provided that this legend is included on all tape 5 * unrestricted use provided that this legend is included on all tape
6 * media and as a part of the software program in whole or part. Users 6 * media and as a part of the software program in whole or part. Users
7 * may copy or modify Sun RPC without charge, but are not authorized 7 * may copy or modify Sun RPC without charge, but are not authorized
8 * to license or distribute it to anyone else except as part of a product or 8 * to license or distribute it to anyone else except as part of a product or
9 * program developed by the user. 9 * program developed by the user.
10 *  10 *
11 * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE 11 * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
12 * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR 12 * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
13 * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. 13 * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
14 *  14 *
@@ -441,34 +441,30 @@ __BEGIN_DECLS @@ -441,34 +441,30 @@ __BEGIN_DECLS
441extern void clnt_perror (CLIENT *, const char *); /* stderr */ 441extern void clnt_perror (CLIENT *, const char *); /* stderr */
442extern char *clnt_sperror (CLIENT *, const char *); /* string */ 442extern char *clnt_sperror (CLIENT *, const char *); /* string */
443__END_DECLS 443__END_DECLS
444 444
445 445
446/*  446/*
447 * If a creation fails, the following allows the user to figure out why. 447 * If a creation fails, the following allows the user to figure out why.
448 */ 448 */
449struct rpc_createerr { 449struct rpc_createerr {
450 enum clnt_stat cf_stat; 450 enum clnt_stat cf_stat;
451 struct rpc_err cf_error; /* useful when cf_stat == RPC_PMAPFAILURE */ 451 struct rpc_err cf_error; /* useful when cf_stat == RPC_PMAPFAILURE */
452}; 452};
453 453
454#ifdef _REENTRANT 
455__BEGIN_DECLS 454__BEGIN_DECLS
456extern struct rpc_createerr *__rpc_createerr(void); 455extern struct rpc_createerr *__rpc_createerr(void);
457__END_DECLS 456__END_DECLS
458#define rpc_createerr (*(__rpc_createerr())) 457#define rpc_createerr (*(__rpc_createerr()))
459#else 
460extern struct rpc_createerr rpc_createerr; 
461#endif /* _REENTRANT */ 
462 458
463/* 459/*
464 * The simplified interface: 460 * The simplified interface:
465 * enum clnt_stat 461 * enum clnt_stat
466 * rpc_call(host, prognum, versnum, procnum, inproc, in, outproc, out, nettype) 462 * rpc_call(host, prognum, versnum, procnum, inproc, in, outproc, out, nettype)
467 * const char *host; 463 * const char *host;
468 * const rpcprog_t prognum; 464 * const rpcprog_t prognum;
469 * const rpcvers_t versnum; 465 * const rpcvers_t versnum;
470 * const rpcproc_t procnum; 466 * const rpcproc_t procnum;
471 * const xdrproc_t inproc, outproc; 467 * const xdrproc_t inproc, outproc;
472 * const char *in; 468 * const char *in;
473 * char *out; 469 * char *out;
474 * const char *nettype; 470 * const char *nettype;