-Wall cleanup: trim unused vars, better err() message in stdhosts,

and constify rcsid[]

deraadt@ ok

17 files changed, 34 insertions, 40 deletions

diff --git a/usr.sbin/ypserv/common/yplib_host.c b/usr.sbin/ypserv/common/yplib_host.c
index f92d9ebe2c8..168a1707818 100644
--- a/usr.sbin/ypserv/common/yplib_host.c
+++ b/usr.sbin/ypserv/common/yplib_host.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yplib_host.c,v 1.11 2002/07/19 02:38:40 deraadt Exp $ */
+/*	$OpenBSD: yplib_host.c,v 1.12 2003/05/05 08:37:05 avsm Exp $ */
 
 /*
  * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@theos.com>
@@ -32,7 +32,7 @@
  */
 
 #ifndef LINT
-static char *rcsid = "$OpenBSD: yplib_host.c,v 1.11 2002/07/19 02:38:40 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: yplib_host.c,v 1.12 2003/05/05 08:37:05 avsm Exp $";
 #endif
 
 #include <sys/param.h>
diff --git a/usr.sbin/ypserv/makedbm/db.c b/usr.sbin/ypserv/makedbm/db.c
index 8b0b8cd003a..423b768504b 100644
--- a/usr.sbin/ypserv/makedbm/db.c
+++ b/usr.sbin/ypserv/makedbm/db.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db.c,v 1.4 2002/07/19 02:38:40 deraadt Exp $ */
+/*	$OpenBSD: db.c,v 1.5 2003/05/05 08:37:05 avsm Exp $ */
 
 /*
  * Copyright (c) 1997 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: db.c,v 1.4 2002/07/19 02:38:40 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: db.c,v 1.5 2003/05/05 08:37:05 avsm Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/ypserv/makedbm/makedbm.c b/usr.sbin/ypserv/makedbm/makedbm.c
index 4f1ba5b908f..3a853d26398 100644
--- a/usr.sbin/ypserv/makedbm/makedbm.c
+++ b/usr.sbin/ypserv/makedbm/makedbm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: makedbm.c,v 1.19 2002/07/19 20:59:40 deraadt Exp $ */
+/*	$OpenBSD: makedbm.c,v 1.20 2003/05/05 08:37:05 avsm Exp $ */
 
 /*
  * Copyright (c) 1994-97 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: makedbm.c,v 1.19 2002/07/19 20:59:40 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: makedbm.c,v 1.20 2003/05/05 08:37:05 avsm Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.sbin/ypserv/mkalias/mkalias.c b/usr.sbin/ypserv/mkalias/mkalias.c
index febe1c4cdf5..cff38e29320 100644
--- a/usr.sbin/ypserv/mkalias/mkalias.c
+++ b/usr.sbin/ypserv/mkalias/mkalias.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkalias.c,v 1.12 2002/09/06 21:37:38 maja Exp $ */
+/*	$OpenBSD: mkalias.c,v 1.13 2003/05/05 08:37:05 avsm Exp $ */
 
 /*
  * Copyright (c) 1997 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: mkalias.c,v 1.12 2002/09/06 21:37:38 maja Exp $";
+static const char rcsid[] = "$OpenBSD: mkalias.c,v 1.13 2003/05/05 08:37:05 avsm Exp $";
 #endif
 
 #include <ctype.h>
diff --git a/usr.sbin/ypserv/mknetid/mknetid.c b/usr.sbin/ypserv/mknetid/mknetid.c
index defa83e1e59..c046e34bd77 100644
--- a/usr.sbin/ypserv/mknetid/mknetid.c
+++ b/usr.sbin/ypserv/mknetid/mknetid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mknetid.c,v 1.9 2002/07/19 20:59:40 deraadt Exp $ */
+/*	$OpenBSD: mknetid.c,v 1.10 2003/05/05 08:37:05 avsm Exp $ */
 
 /*
  * Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: mknetid.c,v 1.9 2002/07/19 20:59:40 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: mknetid.c,v 1.10 2003/05/05 08:37:05 avsm Exp $";
 #endif
 
 #include <sys/param.h>
diff --git a/usr.sbin/ypserv/stdethers/stdethers.c b/usr.sbin/ypserv/stdethers/stdethers.c
index 1bafed0b6c2..50080e36b31 100644
--- a/usr.sbin/ypserv/stdethers/stdethers.c
+++ b/usr.sbin/ypserv/stdethers/stdethers.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdethers.c,v 1.7 2003/03/13 09:09:51 deraadt Exp $ */
+/*	$OpenBSD: stdethers.c,v 1.8 2003/05/05 08:37:05 avsm Exp $ */
 
 /*
  * Copyright (c) 1995 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: stdethers.c,v 1.7 2003/03/13 09:09:51 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: stdethers.c,v 1.8 2003/05/05 08:37:05 avsm Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/ypserv/stdhosts/stdhosts.c b/usr.sbin/ypserv/stdhosts/stdhosts.c
index 856b81df94c..00a1b40473f 100644
--- a/usr.sbin/ypserv/stdhosts/stdhosts.c
+++ b/usr.sbin/ypserv/stdhosts/stdhosts.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdhosts.c,v 1.9 2003/02/11 01:08:27 maja Exp $ */
+/*	$OpenBSD: stdhosts.c,v 1.10 2003/05/05 08:37:05 avsm Exp $ */
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: stdhosts.c,v 1.9 2003/02/11 01:08:27 maja Exp $";
+static const char rcsid[] = "$OpenBSD: stdhosts.c,v 1.10 2003/05/05 08:37:05 avsm Exp $";
 #endif
 
 #include <sys/types.h>
@@ -90,7 +90,7 @@ main(int argc, char *argv[])
 
 	if (argc == 2) {
 		if ((data_file = fopen(argv[argc-1], "r")) == NULL)
-			err(1, "");
+			err(1, "error opening %s", argv[argc-1]);
 	} else
 		data_file = stdin;
 
diff --git a/usr.sbin/ypserv/yppush/yppush.c b/usr.sbin/ypserv/yppush/yppush.c
index 1cabfe07f48..d05359a82b1 100644
--- a/usr.sbin/ypserv/yppush/yppush.c
+++ b/usr.sbin/ypserv/yppush/yppush.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yppush.c,v 1.18 2002/11/21 21:01:11 deraadt Exp $ */
+/*	$OpenBSD: yppush.c,v 1.19 2003/05/05 08:37:05 avsm Exp $ */
 
 /*
  * Copyright (c) 1995 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: yppush.c,v 1.18 2002/11/21 21:01:11 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: yppush.c,v 1.19 2003/05/05 08:37:05 avsm Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/ypserv/yppush/yppush_err.c b/usr.sbin/ypserv/yppush/yppush_err.c
index c910dede8f2..76b00dfc1b5 100644
--- a/usr.sbin/ypserv/yppush/yppush_err.c
+++ b/usr.sbin/ypserv/yppush/yppush_err.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yppush_err.c,v 1.4 2002/07/19 02:38:40 deraadt Exp $ */
+/*	$OpenBSD: yppush_err.c,v 1.5 2003/05/05 08:37:05 avsm Exp $ */
 
 /*
  * Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: yppush_err.c,v 1.4 2002/07/19 02:38:40 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: yppush_err.c,v 1.5 2003/05/05 08:37:05 avsm Exp $";
 #endif /* not lint */
 
 #include <rpcsvc/yp.h>
diff --git a/usr.sbin/ypserv/yppush/yppush_proc.c b/usr.sbin/ypserv/yppush/yppush_proc.c
index 1c451984da9..c5c19e85f4e 100644
--- a/usr.sbin/ypserv/yppush/yppush_proc.c
+++ b/usr.sbin/ypserv/yppush/yppush_proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yppush_proc.c,v 1.5 2002/07/19 02:38:40 deraadt Exp $ */
+/*	$OpenBSD: yppush_proc.c,v 1.6 2003/05/05 08:37:05 avsm Exp $ */
 
 /*
  * Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: yppush_proc.c,v 1.5 2002/07/19 02:38:40 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: yppush_proc.c,v 1.6 2003/05/05 08:37:05 avsm Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.sbin/ypserv/yppush/yppush_svc.c b/usr.sbin/ypserv/yppush/yppush_svc.c
index 425b8ab2167..142127ad12d 100644
--- a/usr.sbin/ypserv/yppush/yppush_svc.c
+++ b/usr.sbin/ypserv/yppush/yppush_svc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yppush_svc.c,v 1.8 2002/07/19 02:38:40 deraadt Exp $ */
+/*	$OpenBSD: yppush_svc.c,v 1.9 2003/05/05 08:37:05 avsm Exp $ */
 
 /*
  * Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: yppush_svc.c,v 1.8 2002/07/19 02:38:40 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: yppush_svc.c,v 1.9 2003/05/05 08:37:05 avsm Exp $";
 #endif /* not lint */
 
 #include "yppush.h"
diff --git a/usr.sbin/ypserv/ypserv/acl.c b/usr.sbin/ypserv/ypserv/acl.c
index 4b1341ed6bb..f5aa0a54979 100644
--- a/usr.sbin/ypserv/ypserv/acl.c
+++ b/usr.sbin/ypserv/ypserv/acl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acl.c,v 1.8 2002/07/19 02:38:40 deraadt Exp $ */
+/*	$OpenBSD: acl.c,v 1.9 2003/05/05 08:37:05 avsm Exp $ */
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: acl.c,v 1.8 2002/07/19 02:38:40 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: acl.c,v 1.9 2003/05/05 08:37:05 avsm Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/ypserv/ypserv/ypserv.c b/usr.sbin/ypserv/ypserv/ypserv.c
index f5fb73d3415..1afe3d85760 100644
--- a/usr.sbin/ypserv/ypserv/ypserv.c
+++ b/usr.sbin/ypserv/ypserv/ypserv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypserv.c,v 1.26 2003/02/13 05:54:39 maja Exp $ */
+/*	$OpenBSD: ypserv.c,v 1.27 2003/05/05 08:37:05 avsm Exp $ */
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: ypserv.c,v 1.26 2003/02/13 05:54:39 maja Exp $";
+static const char rcsid[] = "$OpenBSD: ypserv.c,v 1.27 2003/05/05 08:37:05 avsm Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/ypserv/ypserv/ypserv_db.c b/usr.sbin/ypserv/ypserv/ypserv_db.c
index aa277572aec..f71e7be83aa 100644
--- a/usr.sbin/ypserv/ypserv/ypserv_db.c
+++ b/usr.sbin/ypserv/ypserv/ypserv_db.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypserv_db.c,v 1.18 2003/04/05 10:44:28 avsm Exp $ */
+/*	$OpenBSD: ypserv_db.c,v 1.19 2003/05/05 08:37:05 avsm Exp $ */
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -34,7 +34,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: ypserv_db.c,v 1.18 2003/04/05 10:44:28 avsm Exp $";
+static const char rcsid[] = "$OpenBSD: ypserv_db.c,v 1.19 2003/05/05 08:37:05 avsm Exp $";
 #endif
 
 /*
diff --git a/usr.sbin/ypserv/ypserv/ypserv_proc.c b/usr.sbin/ypserv/ypserv/ypserv_proc.c
index ab09532c00c..85f96362e80 100644
--- a/usr.sbin/ypserv/ypserv/ypserv_proc.c
+++ b/usr.sbin/ypserv/ypserv/ypserv_proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypserv_proc.c,v 1.19 2003/02/13 05:54:39 maja Exp $ */
+/*	$OpenBSD: ypserv_proc.c,v 1.20 2003/05/05 08:37:05 avsm Exp $ */
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: ypserv_proc.c,v 1.19 2003/02/13 05:54:39 maja Exp $";
+static const char rcsid[] = "$OpenBSD: ypserv_proc.c,v 1.20 2003/05/05 08:37:05 avsm Exp $";
 #endif
 
 #include <rpc/rpc.h>
diff --git a/usr.sbin/ypserv/ypserv/ypserv_xdr_v1.c b/usr.sbin/ypserv/ypserv/ypserv_xdr_v1.c
index f4fdb5cc405..abed54e4d75 100644
--- a/usr.sbin/ypserv/ypserv/ypserv_xdr_v1.c
+++ b/usr.sbin/ypserv/ypserv/ypserv_xdr_v1.c
@@ -6,7 +6,7 @@
 #include <rpcsvc/yp.h>
 #include "ypv1.h"
 #ifndef lint
-static char rcsid[] = "$OpenBSD: ypserv_xdr_v1.c,v 1.4 2003/02/13 05:54:39 maja Exp $";
+static const char rcsid[] = "$OpenBSD: ypserv_xdr_v1.c,v 1.5 2003/05/05 08:37:05 avsm Exp $";
 #endif /* not lint */
 
 bool_t
@@ -14,8 +14,6 @@ xdr_ypreqtype(xdrs, objp)
 	XDR *xdrs;
 	ypreqtype *objp;
 {
-	int32_t *buf;
-
 	if (!xdr_enum(xdrs, (enum_t *)objp)) {
 		return (FALSE);
 	}
@@ -27,8 +25,6 @@ xdr_ypresptype(xdrs, objp)
 	XDR *xdrs;
 	ypresptype *objp;
 {
-	int32_t *buf;
-
 	if (!xdr_enum(xdrs, (enum_t *)objp)) {
 		return (FALSE);
 	}
@@ -70,8 +66,6 @@ xdr_ypresponse(xdrs, objp)
 	XDR *xdrs;
 	ypresponse *objp;
 {
-	int32_t *buf;
-
 	if (!xdr_ypresptype(xdrs, &objp->yp_resptype)) {
 		return (FALSE);
 	}
diff --git a/usr.sbin/ypserv/yptest/yptest.c b/usr.sbin/ypserv/yptest/yptest.c
index 5f148828fa2..6f3bbb8e16f 100644
--- a/usr.sbin/ypserv/yptest/yptest.c
+++ b/usr.sbin/ypserv/yptest/yptest.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yptest.c,v 1.13 2003/01/04 14:00:01 maja Exp $ */
+/*	$OpenBSD: yptest.c,v 1.14 2003/05/05 08:37:05 avsm Exp $ */
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: yptest.c,v 1.13 2003/01/04 14:00:01 maja Exp $";
+static const char rcsid[] = "$OpenBSD: yptest.c,v 1.14 2003/05/05 08:37:05 avsm Exp $";
 #endif
 
 #include <stdio.h>