summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2002-07-20 01:35:36 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2002-07-20 01:35:36 +0000
commitccc5cbde0e4564f3af83fa82bd2a7d2f810b4b62 (patch)
treea0ecfcd8bfcc8424edde9c09913f5a60e7b2f2b5 /lib
parent4293f75624bc531155794d4ba9cc34d09d7b6a8b (diff)
ansi
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/yp/_yp_check.c5
-rw-r--r--lib/libc/yp/xdr_domainname.c6
-rw-r--r--lib/libc/yp/xdr_keydat.c6
-rw-r--r--lib/libc/yp/xdr_mapname.c6
-rw-r--r--lib/libc/yp/xdr_peername.c6
-rw-r--r--lib/libc/yp/xdr_valdat.c6
-rw-r--r--lib/libc/yp/xdr_ypbind_binding.c6
-rw-r--r--lib/libc/yp/xdr_ypbind_resp.c8
-rw-r--r--lib/libc/yp/xdr_ypbind_resptype.c6
-rw-r--r--lib/libc/yp/xdr_ypbind_setdom.c6
-rw-r--r--lib/libc/yp/xdr_ypmaplist.c6
-rw-r--r--lib/libc/yp/xdr_ypreq_key.c6
-rw-r--r--lib/libc/yp/xdr_ypreq_nokey.c6
-rw-r--r--lib/libc/yp/xdr_ypresp_all.c6
-rw-r--r--lib/libc/yp/xdr_ypresp_key_val.c6
-rw-r--r--lib/libc/yp/xdr_ypresp_maplist.c6
-rw-r--r--lib/libc/yp/xdr_ypresp_master.c6
-rw-r--r--lib/libc/yp/xdr_ypresp_order.c6
-rw-r--r--lib/libc/yp/xdr_ypresp_val.c6
-rw-r--r--lib/libc/yp/xdr_ypstat.c6
-rw-r--r--lib/libc/yp/yp_all.c11
-rw-r--r--lib/libc/yp/yp_bind.c17
-rw-r--r--lib/libc/yp/yp_first.c11
-rw-r--r--lib/libc/yp/yp_get_default_domain.c5
-rw-r--r--lib/libc/yp/yp_maplist.c6
-rw-r--r--lib/libc/yp/yp_master.c7
-rw-r--r--lib/libc/yp/yp_order.c7
-rw-r--r--lib/libc/yp/yperr_string.c5
-rw-r--r--lib/libc/yp/ypinternal.h12
-rw-r--r--lib/libc/yp/ypmatch_cache.c40
-rw-r--r--lib/libc/yp/ypprot_err.c5
31 files changed, 81 insertions, 166 deletions
diff --git a/lib/libc/yp/_yp_check.c b/lib/libc/yp/_yp_check.c
index f4d6f2f664b..df69f0cbd2e 100644
--- a/lib/libc/yp/_yp_check.c
+++ b/lib/libc/yp/_yp_check.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: _yp_check.c,v 1.3 1996/08/19 08:34:57 tholo Exp $";
+static char *rcsid = "$OpenBSD: _yp_check.c,v 1.4 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -50,8 +50,7 @@ static char *rcsid = "$OpenBSD: _yp_check.c,v 1.3 1996/08/19 08:34:57 tholo Exp
#include "ypinternal.h"
int
-_yp_check(dom)
- char **dom;
+_yp_check(char **dom)
{
char *unused;
diff --git a/lib/libc/yp/xdr_domainname.c b/lib/libc/yp/xdr_domainname.c
index b16197ec9d5..ae96a93b412 100644
--- a/lib/libc/yp/xdr_domainname.c
+++ b/lib/libc/yp/xdr_domainname.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_domainname.c,v 1.3 1996/08/19 08:34:58 tholo Exp $";
+static char *rcsid = "$OpenBSD: xdr_domainname.c,v 1.4 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -46,9 +46,7 @@ static char *rcsid = "$OpenBSD: xdr_domainname.c,v 1.3 1996/08/19 08:34:58 tholo
#include <rpcsvc/ypclnt.h>
bool_t
-xdr_domainname(xdrs, objp)
-XDR *xdrs;
-domainname *objp;
+xdr_domainname(XDR *xdrs, domainname *objp)
{
return xdr_string(xdrs, objp, YPMAXDOMAIN);
}
diff --git a/lib/libc/yp/xdr_keydat.c b/lib/libc/yp/xdr_keydat.c
index b6ff3c48b8a..d81bb4bac96 100644
--- a/lib/libc/yp/xdr_keydat.c
+++ b/lib/libc/yp/xdr_keydat.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_keydat.c,v 1.4 1996/08/19 08:34:58 tholo Exp $";
+static char *rcsid = "$OpenBSD: xdr_keydat.c,v 1.5 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -46,9 +46,7 @@ static char *rcsid = "$OpenBSD: xdr_keydat.c,v 1.4 1996/08/19 08:34:58 tholo Exp
#include <rpcsvc/ypclnt.h>
bool_t
-xdr_keydat(xdrs, objp)
-XDR *xdrs;
-keydat *objp;
+xdr_keydat(XDR *xdrs, keydat *objp)
{
return xdr_bytes(xdrs, (char **)&objp->keydat_val,
(u_int *)&objp->keydat_len, YPMAXRECORD);
diff --git a/lib/libc/yp/xdr_mapname.c b/lib/libc/yp/xdr_mapname.c
index 7c84e0b832d..8cef8ce1aa9 100644
--- a/lib/libc/yp/xdr_mapname.c
+++ b/lib/libc/yp/xdr_mapname.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_mapname.c,v 1.3 1996/08/19 08:34:59 tholo Exp $";
+static char *rcsid = "$OpenBSD: xdr_mapname.c,v 1.4 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -46,9 +46,7 @@ static char *rcsid = "$OpenBSD: xdr_mapname.c,v 1.3 1996/08/19 08:34:59 tholo Ex
#include <rpcsvc/ypclnt.h>
bool_t
-xdr_mapname(xdrs, objp)
-XDR *xdrs;
-mapname *objp;
+xdr_mapname(XDR *xdrs, mapname *objp)
{
return xdr_string(xdrs, objp, YPMAXMAP);
}
diff --git a/lib/libc/yp/xdr_peername.c b/lib/libc/yp/xdr_peername.c
index 6a312cf0a81..152ea486c75 100644
--- a/lib/libc/yp/xdr_peername.c
+++ b/lib/libc/yp/xdr_peername.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_peername.c,v 1.3 1996/08/19 08:34:59 tholo Exp $";
+static char *rcsid = "$OpenBSD: xdr_peername.c,v 1.4 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -46,9 +46,7 @@ static char *rcsid = "$OpenBSD: xdr_peername.c,v 1.3 1996/08/19 08:34:59 tholo E
#include <rpcsvc/ypclnt.h>
bool_t
-xdr_peername(xdrs, objp)
-XDR *xdrs;
-peername *objp;
+xdr_peername(XDR *xdrs, peername *objp)
{
return xdr_string(xdrs, objp, YPMAXPEER);
}
diff --git a/lib/libc/yp/xdr_valdat.c b/lib/libc/yp/xdr_valdat.c
index 03314b6180e..b0be6592d15 100644
--- a/lib/libc/yp/xdr_valdat.c
+++ b/lib/libc/yp/xdr_valdat.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_valdat.c,v 1.4 1996/08/19 08:35:00 tholo Exp $";
+static char *rcsid = "$OpenBSD: xdr_valdat.c,v 1.5 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -46,9 +46,7 @@ static char *rcsid = "$OpenBSD: xdr_valdat.c,v 1.4 1996/08/19 08:35:00 tholo Exp
#include <rpcsvc/ypclnt.h>
bool_t
-xdr_valdat(xdrs, objp)
-XDR *xdrs;
-valdat *objp;
+xdr_valdat(XDR *xdrs, valdat *objp)
{
return xdr_bytes(xdrs, (char **)&objp->valdat_val,
(u_int *)&objp->valdat_len, YPMAXRECORD);
diff --git a/lib/libc/yp/xdr_ypbind_binding.c b/lib/libc/yp/xdr_ypbind_binding.c
index a648df47655..3261ef33ec9 100644
--- a/lib/libc/yp/xdr_ypbind_binding.c
+++ b/lib/libc/yp/xdr_ypbind_binding.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_ypbind_binding.c,v 1.3 1996/08/19 08:35:00 tholo Exp $";
+static char *rcsid = "$OpenBSD: xdr_ypbind_binding.c,v 1.4 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -46,9 +46,7 @@ static char *rcsid = "$OpenBSD: xdr_ypbind_binding.c,v 1.3 1996/08/19 08:35:00 t
#include <rpcsvc/ypclnt.h>
bool_t
-xdr_ypbind_binding(xdrs, objp)
-XDR *xdrs;
-struct ypbind_binding *objp;
+xdr_ypbind_binding(XDR *xdrs, struct ypbind_binding *objp)
{
if (!xdr_opaque(xdrs, objp->ypbind_binding_addr, 4)) {
return (FALSE);
diff --git a/lib/libc/yp/xdr_ypbind_resp.c b/lib/libc/yp/xdr_ypbind_resp.c
index 317b69491f7..a304f157577 100644
--- a/lib/libc/yp/xdr_ypbind_resp.c
+++ b/lib/libc/yp/xdr_ypbind_resp.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_ypbind_resp.c,v 1.3 1996/08/19 08:35:01 tholo Exp $";
+static char *rcsid = "$OpenBSD: xdr_ypbind_resp.c,v 1.4 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -46,9 +46,7 @@ static char *rcsid = "$OpenBSD: xdr_ypbind_resp.c,v 1.3 1996/08/19 08:35:01 thol
#include <rpcsvc/ypclnt.h>
bool_t
-xdr_ypbind_resp(xdrs, objp)
-XDR *xdrs;
-struct ypbind_resp *objp;
+xdr_ypbind_resp(XDR *xdrs, struct ypbind_resp *objp)
{
if (!xdr_ypbind_resptype(xdrs, &objp->ypbind_status)) {
return FALSE;
@@ -59,7 +57,7 @@ struct ypbind_resp *objp;
return xdr_u_int(xdrs,
(u_int *)&objp->ypbind_resp_u.ypbind_error);
case YPBIND_SUCC_VAL:
- return xdr_ypbind_binding(xdrs,
+ return xdr_ypbind_binding(xdrs,
&objp->ypbind_resp_u.ypbind_bindinfo);
default:
return FALSE;
diff --git a/lib/libc/yp/xdr_ypbind_resptype.c b/lib/libc/yp/xdr_ypbind_resptype.c
index a558d1615c4..997693ac2bd 100644
--- a/lib/libc/yp/xdr_ypbind_resptype.c
+++ b/lib/libc/yp/xdr_ypbind_resptype.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_ypbind_resptype.c,v 1.3 1996/08/19 08:35:01 tholo Exp $";
+static char *rcsid = "$OpenBSD: xdr_ypbind_resptype.c,v 1.4 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -46,9 +46,7 @@ static char *rcsid = "$OpenBSD: xdr_ypbind_resptype.c,v 1.3 1996/08/19 08:35:01
#include <rpcsvc/ypclnt.h>
bool_t
-xdr_ypbind_resptype(xdrs, objp)
-XDR *xdrs;
-enum ypbind_resptype *objp;
+xdr_ypbind_resptype(XDR *xdrs, enum ypbind_resptype *objp)
{
return xdr_enum(xdrs, (enum_t *)objp);
}
diff --git a/lib/libc/yp/xdr_ypbind_setdom.c b/lib/libc/yp/xdr_ypbind_setdom.c
index 3aa6f19613d..b585eb33738 100644
--- a/lib/libc/yp/xdr_ypbind_setdom.c
+++ b/lib/libc/yp/xdr_ypbind_setdom.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_ypbind_setdom.c,v 1.3 1996/08/19 08:35:02 tholo Exp $";
+static char *rcsid = "$OpenBSD: xdr_ypbind_setdom.c,v 1.4 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -46,9 +46,7 @@ static char *rcsid = "$OpenBSD: xdr_ypbind_setdom.c,v 1.3 1996/08/19 08:35:02 th
#include <rpcsvc/ypclnt.h>
bool_t
-xdr_ypbind_setdom(xdrs, objp)
-XDR *xdrs;
-struct ypbind_setdom *objp;
+xdr_ypbind_setdom(XDR *xdrs, struct ypbind_setdom *objp)
{
if (!xdr_domainname(xdrs, (domainname *)&objp->ypsetdom_domain)) {
return FALSE;
diff --git a/lib/libc/yp/xdr_ypmaplist.c b/lib/libc/yp/xdr_ypmaplist.c
index 6b554b00edd..349b21d668b 100644
--- a/lib/libc/yp/xdr_ypmaplist.c
+++ b/lib/libc/yp/xdr_ypmaplist.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_ypmaplist.c,v 1.3 1996/08/19 08:35:02 tholo Exp $";
+static char *rcsid = "$OpenBSD: xdr_ypmaplist.c,v 1.4 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -46,9 +46,7 @@ static char *rcsid = "$OpenBSD: xdr_ypmaplist.c,v 1.3 1996/08/19 08:35:02 tholo
#include <rpcsvc/ypclnt.h>
bool_t
-xdr_ypmaplist(xdrs, objp)
-XDR *xdrs;
-struct ypmaplist *objp;
+xdr_ypmaplist(XDR *xdrs, struct ypmaplist *objp)
{
if (!xdr_mapname(xdrs, (mapname *)&objp->map)) {
return FALSE;
diff --git a/lib/libc/yp/xdr_ypreq_key.c b/lib/libc/yp/xdr_ypreq_key.c
index c14985998c7..0c45509289e 100644
--- a/lib/libc/yp/xdr_ypreq_key.c
+++ b/lib/libc/yp/xdr_ypreq_key.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_ypreq_key.c,v 1.3 1996/08/19 08:35:03 tholo Exp $";
+static char *rcsid = "$OpenBSD: xdr_ypreq_key.c,v 1.4 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -46,9 +46,7 @@ static char *rcsid = "$OpenBSD: xdr_ypreq_key.c,v 1.3 1996/08/19 08:35:03 tholo
#include <rpcsvc/ypclnt.h>
bool_t
-xdr_ypreq_key(xdrs, objp)
-XDR *xdrs;
-struct ypreq_key *objp;
+xdr_ypreq_key(XDR *xdrs, struct ypreq_key *objp)
{
if (!xdr_domainname(xdrs, (domainname *)&objp->domain)) {
return FALSE;
diff --git a/lib/libc/yp/xdr_ypreq_nokey.c b/lib/libc/yp/xdr_ypreq_nokey.c
index 2c57f7ce446..3fb3da4597d 100644
--- a/lib/libc/yp/xdr_ypreq_nokey.c
+++ b/lib/libc/yp/xdr_ypreq_nokey.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_ypreq_nokey.c,v 1.3 1996/08/19 08:35:03 tholo Exp $";
+static char *rcsid = "$OpenBSD: xdr_ypreq_nokey.c,v 1.4 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -46,9 +46,7 @@ static char *rcsid = "$OpenBSD: xdr_ypreq_nokey.c,v 1.3 1996/08/19 08:35:03 thol
#include <rpcsvc/ypclnt.h>
bool_t
-xdr_ypreq_nokey(xdrs, objp)
-XDR *xdrs;
-struct ypreq_nokey *objp;
+xdr_ypreq_nokey(XDR *xdrs, struct ypreq_nokey *objp)
{
if (!xdr_domainname(xdrs, (domainname *)&objp->domain)) {
return FALSE;
diff --git a/lib/libc/yp/xdr_ypresp_all.c b/lib/libc/yp/xdr_ypresp_all.c
index 04d11084b01..fca5d193f9d 100644
--- a/lib/libc/yp/xdr_ypresp_all.c
+++ b/lib/libc/yp/xdr_ypresp_all.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_ypresp_all.c,v 1.3 1996/08/19 08:35:04 tholo Exp $";
+static char *rcsid = "$OpenBSD: xdr_ypresp_all.c,v 1.4 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -46,9 +46,7 @@ static char *rcsid = "$OpenBSD: xdr_ypresp_all.c,v 1.3 1996/08/19 08:35:04 tholo
#include <rpcsvc/ypclnt.h>
bool_t
-xdr_ypresp_all(xdrs, objp)
-XDR *xdrs;
-struct ypresp_all *objp;
+xdr_ypresp_all(XDR *xdrs, struct ypresp_all *objp)
{
if (!xdr_bool(xdrs, &objp->more)) {
return FALSE;
diff --git a/lib/libc/yp/xdr_ypresp_key_val.c b/lib/libc/yp/xdr_ypresp_key_val.c
index c72ef14ca6c..cbccf036fff 100644
--- a/lib/libc/yp/xdr_ypresp_key_val.c
+++ b/lib/libc/yp/xdr_ypresp_key_val.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_ypresp_key_val.c,v 1.3 1996/08/19 08:35:04 tholo Exp $";
+static char *rcsid = "$OpenBSD: xdr_ypresp_key_val.c,v 1.4 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -46,9 +46,7 @@ static char *rcsid = "$OpenBSD: xdr_ypresp_key_val.c,v 1.3 1996/08/19 08:35:04 t
#include <rpcsvc/ypclnt.h>
bool_t
-xdr_ypresp_key_val(xdrs, objp)
-XDR *xdrs;
-struct ypresp_key_val *objp;
+xdr_ypresp_key_val(XDR *xdrs, struct ypresp_key_val *objp)
{
if (!xdr_ypstat(xdrs, (ypstat *)&objp->stat)) {
return FALSE;
diff --git a/lib/libc/yp/xdr_ypresp_maplist.c b/lib/libc/yp/xdr_ypresp_maplist.c
index ba6ef1a3bb2..a73f689dc92 100644
--- a/lib/libc/yp/xdr_ypresp_maplist.c
+++ b/lib/libc/yp/xdr_ypresp_maplist.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_ypresp_maplist.c,v 1.3 1996/08/19 08:35:05 tholo Exp $";
+static char *rcsid = "$OpenBSD: xdr_ypresp_maplist.c,v 1.4 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -46,9 +46,7 @@ static char *rcsid = "$OpenBSD: xdr_ypresp_maplist.c,v 1.3 1996/08/19 08:35:05 t
#include <rpcsvc/ypclnt.h>
bool_t
-xdr_ypresp_maplist(xdrs, objp)
-XDR *xdrs;
-struct ypresp_maplist *objp;
+xdr_ypresp_maplist(XDR *xdrs, struct ypresp_maplist *objp)
{
if (!xdr_ypstat(xdrs, (ypstat *)&objp->stat)) {
return FALSE;
diff --git a/lib/libc/yp/xdr_ypresp_master.c b/lib/libc/yp/xdr_ypresp_master.c
index c75510c3bc7..12dfa9966c6 100644
--- a/lib/libc/yp/xdr_ypresp_master.c
+++ b/lib/libc/yp/xdr_ypresp_master.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_ypresp_master.c,v 1.3 1996/08/19 08:35:05 tholo Exp $";
+static char *rcsid = "$OpenBSD: xdr_ypresp_master.c,v 1.4 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -46,9 +46,7 @@ static char *rcsid = "$OpenBSD: xdr_ypresp_master.c,v 1.3 1996/08/19 08:35:05 th
#include <rpcsvc/ypclnt.h>
bool_t
-xdr_ypresp_master(xdrs, objp)
-XDR *xdrs;
-struct ypresp_master *objp;
+xdr_ypresp_master(XDR *xdrs, struct ypresp_master *objp)
{
if (!xdr_ypstat(xdrs, (ypstat *)&objp->stat)) {
return FALSE;
diff --git a/lib/libc/yp/xdr_ypresp_order.c b/lib/libc/yp/xdr_ypresp_order.c
index b35e7ba8a4e..ac618a3b466 100644
--- a/lib/libc/yp/xdr_ypresp_order.c
+++ b/lib/libc/yp/xdr_ypresp_order.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_ypresp_order.c,v 1.3 1996/08/19 08:35:06 tholo Exp $";
+static char *rcsid = "$OpenBSD: xdr_ypresp_order.c,v 1.4 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -46,9 +46,7 @@ static char *rcsid = "$OpenBSD: xdr_ypresp_order.c,v 1.3 1996/08/19 08:35:06 tho
#include <rpcsvc/ypclnt.h>
bool_t
-xdr_ypresp_order(xdrs, objp)
-XDR *xdrs;
-struct ypresp_order *objp;
+xdr_ypresp_order(XDR *xdrs, struct ypresp_order *objp)
{
if (!xdr_ypstat(xdrs, (ypstat *)&objp->stat)) {
return FALSE;
diff --git a/lib/libc/yp/xdr_ypresp_val.c b/lib/libc/yp/xdr_ypresp_val.c
index 5ff69a97783..94bf49c6fcb 100644
--- a/lib/libc/yp/xdr_ypresp_val.c
+++ b/lib/libc/yp/xdr_ypresp_val.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_ypresp_val.c,v 1.3 1996/08/19 08:35:06 tholo Exp $";
+static char *rcsid = "$OpenBSD: xdr_ypresp_val.c,v 1.4 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -46,9 +46,7 @@ static char *rcsid = "$OpenBSD: xdr_ypresp_val.c,v 1.3 1996/08/19 08:35:06 tholo
#include <rpcsvc/ypclnt.h>
bool_t
-xdr_ypresp_val(xdrs, objp)
-XDR *xdrs;
-struct ypresp_val *objp;
+xdr_ypresp_val(XDR *xdrs, struct ypresp_val *objp)
{
if (!xdr_ypstat(xdrs, (ypstat *)&objp->stat)) {
return FALSE;
diff --git a/lib/libc/yp/xdr_ypstat.c b/lib/libc/yp/xdr_ypstat.c
index 9e1bb85fc03..5387d20bd24 100644
--- a/lib/libc/yp/xdr_ypstat.c
+++ b/lib/libc/yp/xdr_ypstat.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: xdr_ypstat.c,v 1.4 1996/12/14 06:49:45 tholo Exp $";
+static char *rcsid = "$OpenBSD: xdr_ypstat.c,v 1.5 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -46,9 +46,7 @@ static char *rcsid = "$OpenBSD: xdr_ypstat.c,v 1.4 1996/12/14 06:49:45 tholo Exp
#include <rpcsvc/ypclnt.h>
bool_t
-xdr_ypstat(xdrs, objp)
-XDR *xdrs;
-ypstat *objp;
+xdr_ypstat(XDR *xdrs, ypstat *objp)
{
return xdr_enum(xdrs, (enum_t *)objp);
}
diff --git a/lib/libc/yp/yp_all.c b/lib/libc/yp/yp_all.c
index 6219cd492a5..36071ce7807 100644
--- a/lib/libc/yp/yp_all.c
+++ b/lib/libc/yp/yp_all.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: yp_all.c,v 1.6 2002/01/02 20:58:37 deraadt Exp $";
+static char *rcsid = "$OpenBSD: yp_all.c,v 1.7 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -50,9 +50,7 @@ static char *rcsid = "$OpenBSD: yp_all.c,v 1.6 2002/01/02 20:58:37 deraadt Exp $
#include "ypinternal.h"
bool_t
-xdr_ypresp_all_seq(xdrs, objp)
-XDR *xdrs;
-u_long *objp;
+xdr_ypresp_all_seq(XDR *xdrs, u_long *objp)
{
struct ypresp_all out;
u_long status;
@@ -117,10 +115,7 @@ u_long *objp;
}
int
-yp_all(indomain, inmap, incallback)
- const char *indomain;
- const char *inmap;
- struct ypall_callback *incallback;
+yp_all(const char *indomain, const char *inmap, struct ypall_callback *incallback)
{
struct ypreq_nokey yprnk;
struct dom_binding *ysd;
diff --git a/lib/libc/yp/yp_bind.c b/lib/libc/yp/yp_bind.c
index 5fc3cb72b0b..e054b424b66 100644
--- a/lib/libc/yp/yp_bind.c
+++ b/lib/libc/yp/yp_bind.c
@@ -31,7 +31,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: yp_bind.c,v 1.12 2002/01/02 20:18:32 deraadt Exp $";
+static char *rcsid = "$OpenBSD: yp_bind.c,v 1.13 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -55,9 +55,7 @@ char _yp_domain[MAXHOSTNAMELEN];
int _yplib_timeout = 10;
int
-_yp_dobind(dom, ypdb)
- const char *dom;
- struct dom_binding **ypdb;
+_yp_dobind(const char *dom, struct dom_binding **ypdb)
{
static pid_t pid = -1;
char path[MAXPATHLEN];
@@ -215,7 +213,7 @@ gotdata:
free(ysd);
return YPERR_YPBIND;
}
- (void)memset(&ysd->dom_server_addr, 0,
+ (void)memset(&ysd->dom_server_addr, 0,
sizeof ysd->dom_server_addr);
ysd->dom_server_addr.sin_len = sizeof(struct sockaddr_in);
ysd->dom_server_addr.sin_family = AF_INET;
@@ -254,8 +252,7 @@ gotdata:
}
void
-_yp_unbind(ypb)
- struct dom_binding *ypb;
+_yp_unbind(struct dom_binding *ypb)
{
clnt_destroy(ypb->dom_client);
ypb->dom_client = NULL;
@@ -263,15 +260,13 @@ _yp_unbind(ypb)
}
int
-yp_bind(dom)
- const char *dom;
+yp_bind(const char *dom)
{
return _yp_dobind(dom, NULL);
}
void
-yp_unbind(dom)
- const char *dom;
+yp_unbind(const char *dom)
{
struct dom_binding *ypb, *ypbp;
diff --git a/lib/libc/yp/yp_first.c b/lib/libc/yp/yp_first.c
index cfe3891ea8f..2713b8b0bf1 100644
--- a/lib/libc/yp/yp_first.c
+++ b/lib/libc/yp/yp_first.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: yp_first.c,v 1.5 1996/12/03 08:20:03 deraadt Exp $";
+static char *rcsid = "$OpenBSD: yp_first.c,v 1.6 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -50,13 +50,8 @@ static char *rcsid = "$OpenBSD: yp_first.c,v 1.5 1996/12/03 08:20:03 deraadt Exp
#include "ypinternal.h"
int
-yp_first(indomain, inmap, outkey, outkeylen, outval, outvallen)
- const char *indomain;
- const char *inmap;
- char **outkey;
- int *outkeylen;
- char **outval;
- int *outvallen;
+yp_first(const char *indomain, const char *inmap, char **outkey, int *outkeylen,
+ char **outval, int *outvallen)
{
struct ypresp_key_val yprkv;
struct ypreq_nokey yprnk;
diff --git a/lib/libc/yp/yp_get_default_domain.c b/lib/libc/yp/yp_get_default_domain.c
index 07944d88c1d..deaca0ba956 100644
--- a/lib/libc/yp/yp_get_default_domain.c
+++ b/lib/libc/yp/yp_get_default_domain.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: yp_get_default_domain.c,v 1.3 1996/08/19 08:35:09 tholo Exp $";
+static char *rcsid = "$OpenBSD: yp_get_default_domain.c,v 1.4 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -50,8 +50,7 @@ static char *rcsid = "$OpenBSD: yp_get_default_domain.c,v 1.3 1996/08/19 08:35:0
#include "ypinternal.h"
int
-yp_get_default_domain(domp)
- char **domp;
+yp_get_default_domain(char **domp)
{
*domp = NULL;
if (_yp_domain[0] == '\0')
diff --git a/lib/libc/yp/yp_maplist.c b/lib/libc/yp/yp_maplist.c
index 474d1a6394e..2868e8e925a 100644
--- a/lib/libc/yp/yp_maplist.c
+++ b/lib/libc/yp/yp_maplist.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: yp_maplist.c,v 1.5 1996/12/03 08:20:04 deraadt Exp $";
+static char *rcsid = "$OpenBSD: yp_maplist.c,v 1.6 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -50,9 +50,7 @@ static char *rcsid = "$OpenBSD: yp_maplist.c,v 1.5 1996/12/03 08:20:04 deraadt E
#include "ypinternal.h"
int
-yp_maplist(indomain, outmaplist)
- const char *indomain;
- struct ypmaplist **outmaplist;
+yp_maplist(const char *indomain, struct ypmaplist **outmaplist)
{
struct dom_binding *ysd;
struct ypresp_maplist ypml;
diff --git a/lib/libc/yp/yp_master.c b/lib/libc/yp/yp_master.c
index 4267dcfb212..4c8d9c7029d 100644
--- a/lib/libc/yp/yp_master.c
+++ b/lib/libc/yp/yp_master.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: yp_master.c,v 1.5 1996/12/03 08:20:05 deraadt Exp $";
+static char *rcsid = "$OpenBSD: yp_master.c,v 1.6 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -50,10 +50,7 @@ static char *rcsid = "$OpenBSD: yp_master.c,v 1.5 1996/12/03 08:20:05 deraadt Ex
#include "ypinternal.h"
int
-yp_master(indomain, inmap, outname)
- const char *indomain;
- const char *inmap;
- char **outname;
+yp_master(const char *indomain, const char *inmap, char **outname)
{
struct dom_binding *ysd;
struct ypresp_master yprm;
diff --git a/lib/libc/yp/yp_order.c b/lib/libc/yp/yp_order.c
index 9e864b13693..acea5a314e5 100644
--- a/lib/libc/yp/yp_order.c
+++ b/lib/libc/yp/yp_order.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: yp_order.c,v 1.6 2000/03/15 03:56:48 todd Exp $";
+static char *rcsid = "$OpenBSD: yp_order.c,v 1.7 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -50,10 +50,7 @@ static char *rcsid = "$OpenBSD: yp_order.c,v 1.6 2000/03/15 03:56:48 todd Exp $"
#include "ypinternal.h"
int
-yp_order(indomain, inmap, outorder)
- const char *indomain;
- const char *inmap;
- int *outorder;
+yp_order(const char *indomain, const char *inmap, int *outorder)
{
struct dom_binding *ysd;
struct ypresp_order ypro;
diff --git a/lib/libc/yp/yperr_string.c b/lib/libc/yp/yperr_string.c
index 27810ce35f1..5cdeabe3e79 100644
--- a/lib/libc/yp/yperr_string.c
+++ b/lib/libc/yp/yperr_string.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: yperr_string.c,v 1.3 1996/08/19 08:35:12 tholo Exp $";
+static char *rcsid = "$OpenBSD: yperr_string.c,v 1.4 2002/07/20 01:35:34 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -49,8 +49,7 @@ static char *rcsid = "$OpenBSD: yperr_string.c,v 1.3 1996/08/19 08:35:12 tholo E
#include <rpcsvc/ypclnt.h>
char *
-yperr_string(incode)
- int incode;
+yperr_string(int incode)
{
static char err[80];
diff --git a/lib/libc/yp/ypinternal.h b/lib/libc/yp/ypinternal.h
index ee6cecd25b7..82c1533df05 100644
--- a/lib/libc/yp/ypinternal.h
+++ b/lib/libc/yp/ypinternal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ypinternal.h,v 1.4 2002/02/17 19:42:24 millert Exp $ */
+/* $OpenBSD: ypinternal.h,v 1.5 2002/07/20 01:35:35 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993, 1996 Theo de Raadt <deraadt@theos.com>
@@ -65,11 +65,11 @@ static bool_t ypmatch_add(const char *, const char *, u_int, char *, u_int);
static bool_t ypmatch_find(const char *, const char *, u_int, char **, u_int *);
static struct ypmatch_ent {
- struct ypmatch_ent *next;
- char *map, *key;
- char *val;
- int keylen, vallen;
- time_t expire_t;
+ struct ypmatch_ent *next;
+ char *map, *key;
+ char *val;
+ int keylen, vallen;
+ time_t expire_t;
} *ypmc;
extern int _yplib_cache;
diff --git a/lib/libc/yp/ypmatch_cache.c b/lib/libc/yp/ypmatch_cache.c
index 2c04db26c34..2800bf35542 100644
--- a/lib/libc/yp/ypmatch_cache.c
+++ b/lib/libc/yp/ypmatch_cache.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: ypmatch_cache.c,v 1.7 1998/01/20 18:40:27 deraadt Exp $";
+static char *rcsid = "$OpenBSD: ypmatch_cache.c,v 1.8 2002/07/20 01:35:35 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -53,12 +53,8 @@ static char *rcsid = "$OpenBSD: ypmatch_cache.c,v 1.7 1998/01/20 18:40:27 deraad
int _yplib_cache = 5;
static bool_t
-ypmatch_add(map, key, keylen, val, vallen)
- const char *map;
- const char *key;
- u_int keylen;
- char *val;
- u_int vallen;
+ypmatch_add(const char *map, const char *key, u_int keylen, char *val,
+ u_int vallen)
{
struct ypmatch_ent *ep;
time_t t;
@@ -117,12 +113,8 @@ ypmatch_add(map, key, keylen, val, vallen)
}
static bool_t
-ypmatch_find(map, key, keylen, val, vallen)
- const char *map;
- const char *key;
- u_int keylen;
- char **val;
- u_int *vallen;
+ypmatch_find(const char *map, const char *key, u_int keylen, char **val,
+ u_int *vallen)
{
struct ypmatch_ent *ep;
time_t t;
@@ -150,13 +142,8 @@ ypmatch_find(map, key, keylen, val, vallen)
}
int
-yp_match(indomain, inmap, inkey, inkeylen, outval, outvallen)
- const char *indomain;
- const char *inmap;
- const char *inkey;
- int inkeylen;
- char **outval;
- int *outvallen;
+yp_match(const char *indomain, const char *inmap, const char *inkey,
+ int inkeylen, char **outval, int *outvallen)
{
struct dom_binding *ysd;
struct ypresp_val yprv;
@@ -164,7 +151,7 @@ yp_match(indomain, inmap, inkey, inkeylen, outval, outvallen)
struct ypreq_key yprk;
int tries = 0, r;
- if (indomain == NULL || *indomain == '\0' ||
+ if (indomain == NULL || *indomain == '\0' ||
strlen(indomain) > YPMAXDOMAIN || inmap == NULL ||
*inmap == '\0' || strlen(inmap) > YPMAXMAP ||
inkey == NULL || inkeylen == 0 || inkeylen >= YPMAXRECORD)
@@ -232,15 +219,8 @@ out:
}
int
-yp_next(indomain, inmap, inkey, inkeylen, outkey, outkeylen, outval, outvallen)
- const char *indomain;
- const char *inmap;
- const char *inkey;
- int inkeylen;
- char **outkey;
- int *outkeylen;
- char **outval;
- int *outvallen;
+yp_next(const char *indomain, const char *inmap, const char *inkey,
+ int inkeylen, char **outkey, int *outkeylen, char **outval, int *outvallen)
{
struct ypresp_key_val yprkv;
struct ypreq_key yprk;
diff --git a/lib/libc/yp/ypprot_err.c b/lib/libc/yp/ypprot_err.c
index 20873ffc1a1..d172afca535 100644
--- a/lib/libc/yp/ypprot_err.c
+++ b/lib/libc/yp/ypprot_err.c
@@ -30,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: ypprot_err.c,v 1.4 1996/12/14 06:49:47 tholo Exp $";
+static char *rcsid = "$OpenBSD: ypprot_err.c,v 1.5 2002/07/20 01:35:35 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -49,8 +49,7 @@ static char *rcsid = "$OpenBSD: ypprot_err.c,v 1.4 1996/12/14 06:49:47 tholo Exp
#include <rpcsvc/ypclnt.h>
int
-ypprot_err(incode)
- unsigned int incode;
+ypprot_err(unsigned int incode)
{
switch ((int)incode) {
case YP_TRUE: