From 0f2cb9b020b907000a28323fc57a82fdb7d6626d Mon Sep 17 00:00:00 2001 From: des Date: Wed, 6 Feb 2002 13:30:31 +0000 Subject: Apply the following mechanical transformations in preparation for ansification and constification: s{\s+__P\((\(.*?\))\)}{$1}g; s{\(\s+}{\(}g; s{\s+\)}{\)}g; s{\s+,}{,}g; s{(\s+)(for|if|switch|while)\(}{$1$2 \(}g; s{return ([^\(].*?);}{return ($1);}g; s{([\w\)])([!=+/\*-]?=)([\w\(+-])}{$1 $2 $3}g; s{\s+$}{\n};g Also add $FreeBSD$ where needed. MFC after: 1 week --- include/rpcsvc/yp_prot.h | 28 ++++++++++++++-------------- include/rpcsvc/ypclnt.h | 20 ++++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'include') diff --git a/include/rpcsvc/yp_prot.h b/include/rpcsvc/yp_prot.h index 4b1aa61..d8b31e4 100644 --- a/include/rpcsvc/yp_prot.h +++ b/include/rpcsvc/yp_prot.h @@ -310,20 +310,20 @@ struct yppushresp_xfr { struct inaddr; __BEGIN_DECLS -bool_t xdr_datum __P((XDR *, datum *)); -bool_t xdr_ypreq_key __P((XDR *, struct ypreq_key *)); -bool_t xdr_ypreq_nokey __P((XDR *, struct ypreq_nokey *)); -bool_t xdr_ypreq_xfr __P((XDR *, struct ypreq_xfr *)); -bool_t xdr_ypresp_val __P((XDR *, struct ypresp_val *)); -bool_t xdr_ypresp_key_val __P((XDR *, struct ypresp_key_val *)); -bool_t xdr_ypbind_resp __P((XDR *, struct ypbind_resp *)); -bool_t xdr_ypbind_setdom __P((XDR *, struct ypbind_setdom *)); -bool_t xdr_yp_inaddr __P((XDR *, struct inaddr *)); -bool_t xdr_ypmap_parms __P((XDR *, struct ypmap_parms *)); -bool_t xdr_yppushresp_xfr __P((XDR *, struct yppushresp_xfr *)); -bool_t xdr_ypresp_order __P((XDR *, struct ypresp_order *)); -bool_t xdr_ypresp_master __P((XDR *, struct ypresp_master *)); -bool_t xdr_ypresp_maplist __P((XDR *, struct ypresp_maplist *)); +bool_t xdr_datum(XDR *, datum *); +bool_t xdr_ypreq_key(XDR *, struct ypreq_key *); +bool_t xdr_ypreq_nokey(XDR *, struct ypreq_nokey *); +bool_t xdr_ypreq_xfr(XDR *, struct ypreq_xfr *); +bool_t xdr_ypresp_val(XDR *, struct ypresp_val *); +bool_t xdr_ypresp_key_val(XDR *, struct ypresp_key_val *); +bool_t xdr_ypbind_resp(XDR *, struct ypbind_resp *); +bool_t xdr_ypbind_setdom(XDR *, struct ypbind_setdom *); +bool_t xdr_yp_inaddr(XDR *, struct inaddr *); +bool_t xdr_ypmap_parms(XDR *, struct ypmap_parms *); +bool_t xdr_yppushresp_xfr(XDR *, struct yppushresp_xfr *); +bool_t xdr_ypresp_order(XDR *, struct ypresp_order *); +bool_t xdr_ypresp_master(XDR *, struct ypresp_master *); +bool_t xdr_ypresp_maplist(XDR *, struct ypresp_maplist *); __END_DECLS #endif /* _RPCSVC_YP_PROT_H_ */ diff --git a/include/rpcsvc/ypclnt.h b/include/rpcsvc/ypclnt.h index 6dae7bb..64a742d 100644 --- a/include/rpcsvc/ypclnt.h +++ b/include/rpcsvc/ypclnt.h @@ -61,17 +61,17 @@ struct ypall_callback { /* return non-0 to stop getting called */ - int (*foreach) __P((unsigned long, char *, int, char *, int, void *)); + int (*foreach)(unsigned long, char *, int, char *, int, void *); char *data; /* opaque pointer for use of callback fn */ }; struct dom_binding; __BEGIN_DECLS -int yp_bind __P((char *dom)); -int _yp_dobind __P((char *dom, struct dom_binding **ypdb)); -void yp_unbind __P((char *dom)); -int yp_get_default_domain __P((char **domp)); +int yp_bind(char *dom); +int _yp_dobind(char *dom, struct dom_binding **ypdb); +void yp_unbind(char *dom); +int yp_get_default_domain(char **domp); int yp_match __P((char *indomain, char *inmap, const char *inkey, int inkeylen, char **outval, int *outvallen)); @@ -81,13 +81,13 @@ int yp_first __P((char *indomain, char *inmap, int yp_next __P((char *indomain, char *inmap, char *inkey, int inkeylen, char **outkey, int *outkeylen, char **outval, int *outvallen)); -int yp_master __P((char *indomain, char *inmap, char **outname)); -int yp_order __P((char *indomain, char *inmap, int *outorder)); +int yp_master(char *indomain, char *inmap, char **outname); +int yp_order(char *indomain, char *inmap, int *outorder); int yp_all __P((char *indomain, char *inmap, struct ypall_callback *incallback)); -char * yperr_string __P((int incode)); -char * ypbinderr_string __P((int incode)); -int ypprot_err __P((unsigned int incode)); +char * yperr_string(int incode); +char * ypbinderr_string(int incode); +int ypprot_err(unsigned int incode); __END_DECLS #endif /* _RPCSVC_YPCLNT_H_ */ -- cgit v1.1