Lint is dead

13 files changed, 13 insertions, 57 deletions

diff --git a/usr.sbin/amd/amd/afs_ops.c b/usr.sbin/amd/amd/afs_ops.c
index 79e5c639c10..0969b38db6e 100644
--- a/usr.sbin/amd/amd/afs_ops.c
+++ b/usr.sbin/amd/amd/afs_ops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: afs_ops.c,v 1.15 2014/10/26 01:16:48 guenther Exp $	*/
+/*	$OpenBSD: afs_ops.c,v 1.16 2014/10/26 02:43:50 guenther Exp $	*/
 
 /*
  * Copyright (c) 1990 Jan-Simon Pendry
@@ -636,7 +636,6 @@ afs_cont(int rc, int term, void *closure)
 /*
  * Retry a mount
  */
-/*ARGSUSED*/
 static void
 afs_retry(int rc, int term, void *closure)
 {
diff --git a/usr.sbin/amd/amd/amd.c b/usr.sbin/amd/amd/amd.c
index 8e77b3063c8..4bcf665dd58 100644
--- a/usr.sbin/amd/amd/amd.c
+++ b/usr.sbin/amd/amd/amd.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)amd.c	8.1 (Berkeley) 6/6/93
- *	$Id: amd.c,v 1.20 2014/10/20 06:55:59 guenther Exp $
+ *	$Id: amd.c,v 1.21 2014/10/26 02:43:50 guenther Exp $
  */
 
 /*
@@ -115,7 +115,6 @@ sigterm(int sig)
  * Hook for cache reload.
  * When a SIGHUP arrives it schedules a call to mapc_reload
  */
-/*ARGSUSED*/
 static void
 sighup(int sig)
 {
@@ -131,7 +130,6 @@ sighup(int sig)
 		do_mapc_reload = 0;
 }
 
-/*ARGSUSED*/
 static void
 parent_exit(int sig)
 {
diff --git a/usr.sbin/amd/amd/amq_subr.c b/usr.sbin/amd/amd/amq_subr.c
index 32db57943bd..551e40db437 100644
--- a/usr.sbin/amd/amd/amq_subr.c
+++ b/usr.sbin/amd/amd/amq_subr.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)amq_subr.c	8.1 (Berkeley) 6/6/93
- *	$Id: amq_subr.c,v 1.13 2013/12/03 02:14:57 deraadt Exp $
+ *	$Id: amq_subr.c,v 1.14 2014/10/26 02:43:50 guenther Exp $
  */
 
 /*
@@ -43,7 +43,6 @@
 #include "amq.h"
 #include <ctype.h>
 
-/*ARGSUSED*/
 void *
 amqproc_null_1(void *argp, struct svc_req *rqstp)
 {
@@ -55,7 +54,6 @@ amqproc_null_1(void *argp, struct svc_req *rqstp)
 /*
  * Return a sub-tree of mounts
  */
-/*ARGSUSED*/
 amq_mount_tree_p *
 amqproc_mnttree_1(void *argp, struct svc_req *rqstp)
 {
@@ -68,7 +66,6 @@ amqproc_mnttree_1(void *argp, struct svc_req *rqstp)
 /*
  * Unmount a single node
  */
-/*ARGSUSED*/
 void *
 amqproc_umnt_1(void *argp, struct svc_req *rqstp)
 {
@@ -84,7 +81,6 @@ amqproc_umnt_1(void *argp, struct svc_req *rqstp)
 /*
  * Return global statistics
  */
-/*ARGSUSED*/
 amq_mount_stats *
 amqproc_stats_1(void *argp, struct svc_req *rqstp)
 {
@@ -94,7 +90,6 @@ amqproc_stats_1(void *argp, struct svc_req *rqstp)
 /*
  * Return the entire tree of mount nodes
  */
-/*ARGSUSED*/
 amq_mount_tree_list *
 amqproc_export_1(void *argp, struct svc_req *rqstp)
 {
diff --git a/usr.sbin/amd/amd/efs_ops.c b/usr.sbin/amd/amd/efs_ops.c
index 6578894641d..b8fbf7a389e 100644
--- a/usr.sbin/amd/amd/efs_ops.c
+++ b/usr.sbin/amd/amd/efs_ops.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)efs_ops.c	8.1 (Berkeley) 6/6/93
- *	$Id: efs_ops.c,v 1.3 2003/06/02 23:36:51 millert Exp $
+ *	$Id: efs_ops.c,v 1.4 2014/10/26 02:43:50 guenther Exp $
  */
 
 #include "am.h"
@@ -56,14 +56,12 @@ efs_match(am_opts *fo)
 	return strdup("(error-hook)");
 }
 
-/*ARGSUSED*/
 static int
 efs_fmount(mntfs *mf)
 {
 	return ENOENT;
 }
 
-/*ARGSUSED*/
 static int
 efs_fumount(mntfs *mf)
 {
@@ -79,7 +77,6 @@ efs_fumount(mntfs *mf)
  * Should never get here in the automounter.
  * If we do then just give an error.
  */
-/*ARGSUSED*/
 am_node *
 efs_lookuppn(am_node *mp, char *fname, int *error_return, int op)
 {
@@ -92,7 +89,6 @@ efs_lookuppn(am_node *mp, char *fname, int *error_return, int op)
  * Should never get here in the automounter.
  * If we do then just give an error.
  */
-/*ARGSUSED*/
 int
 efs_readdir(am_node *mp, nfscookie cookie, dirlist *dp, entry *ep,
     int count)
diff --git a/usr.sbin/amd/amd/ifs_ops.c b/usr.sbin/amd/amd/ifs_ops.c
index 19e1e50c60e..42dab033246 100644
--- a/usr.sbin/amd/amd/ifs_ops.c
+++ b/usr.sbin/amd/amd/ifs_ops.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ifs_ops.c	8.1 (Berkeley) 6/6/93
- *	$Id: ifs_ops.c,v 1.4 2007/11/26 09:28:34 martynas Exp $
+ *	$Id: ifs_ops.c,v 1.5 2014/10/26 02:43:50 guenther Exp $
  */
 
 #include "am.h"
@@ -51,7 +51,6 @@ static char not_a_filesystem[] = "Attempting to inherit not-a-filesystem";
 /*
  * This should never be called.
  */
-/*ARGSUSED*/
 static char *
 ifs_match(am_opts *fo)
 {
@@ -150,7 +149,6 @@ ifs_fmount(mntfs *mf)
 	return ifs_inherit(mf) ? 0 : EINVAL;
 }
 
-/*ARGSUSED*/
 static int
 ifs_fumount(mntfs *mf)
 {
diff --git a/usr.sbin/amd/amd/mapc.c b/usr.sbin/amd/amd/mapc.c
index 671e7d49101..4ead96945dc 100644
--- a/usr.sbin/amd/amd/mapc.c
+++ b/usr.sbin/amd/amd/mapc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mapc.c,v 1.17 2014/10/20 06:55:59 guenther Exp $	*/
+/*	$OpenBSD: mapc.c,v 1.18 2014/10/26 02:43:50 guenther Exp $	*/
 
 /*-
  * Copyright (c) 1989 Jan-Simon Pendry
@@ -779,14 +779,12 @@ error_init(char *map, time_t *tp)
 	return 0;
 }
 
-/*ARGSUSED*/
 static int
 error_search(mnt_map *m, char *map, char *key, char **pval, time_t *tp)
 {
 	return ENOENT;
 }
 
-/*ARGSUSED*/
 static int
 error_reload(mnt_map *m, char *map, add_fn *fn)
 {
diff --git a/usr.sbin/amd/amd/nfs_subr.c b/usr.sbin/amd/amd/nfs_subr.c
index 9e2471304b7..a818c090071 100644
--- a/usr.sbin/amd/amd/nfs_subr.c
+++ b/usr.sbin/amd/amd/nfs_subr.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nfs_subr.c	8.1 (Berkeley) 6/6/93
- *	$Id: nfs_subr.c,v 1.6 2014/10/20 02:33:42 guenther Exp $
+ *	$Id: nfs_subr.c,v 1.7 2014/10/26 02:43:50 guenther Exp $
  */
 
 #include "am.h"
@@ -78,7 +78,6 @@ do_readlink(am_node *mp, int *error_return, struct attrstat **attrpp)
 	return ln;
 }
 
-/*ARGSUSED*/
 void *
 nfsproc_null_2(void *argp, struct svc_req *rqstp)
 {
@@ -88,7 +87,6 @@ nfsproc_null_2(void *argp, struct svc_req *rqstp)
 }
 
 
-/*ARGSUSED*/
 struct attrstat *
 nfsproc_getattr_2(struct nfs_fh *argp, struct svc_req *rqstp)
 {
@@ -131,7 +129,6 @@ getattr_retry:
 }
 
 
-/*ARGSUSED*/
 struct attrstat *
 nfsproc_setattr_2(struct sattrargs *argp, struct svc_req *rqstp)
 {
@@ -146,7 +143,6 @@ nfsproc_setattr_2(struct sattrargs *argp, struct svc_req *rqstp)
 }
 
 
-/*ARGSUSED*/
 void *
 nfsproc_root_2(void *argp, struct svc_req *rqstp)
 {
@@ -156,7 +152,6 @@ nfsproc_root_2(void *argp, struct svc_req *rqstp)
 }
 
 
-/*ARGSUSED*/
 struct diropres *
 nfsproc_lookup_2(struct diropargs *argp, struct svc_req *rqstp)
 {
@@ -204,7 +199,6 @@ nfsproc_lookup_2(struct diropargs *argp, struct svc_req *rqstp)
 }
 
 
-/*ARGSUSED*/
 struct readlinkres *
 nfsproc_readlink_2(struct nfs_fh *argp, struct svc_req *rqstp)
 {
@@ -241,7 +235,6 @@ readlink_retry:
 }
 
 
-/*ARGSUSED*/
 struct readres *
 nfsproc_read_2(struct readargs *argp, struct svc_req *rqstp)
 {
@@ -255,7 +248,6 @@ nfsproc_read_2(struct readargs *argp, struct svc_req *rqstp)
 }
 
 
-/*ARGSUSED*/
 void *
 nfsproc_writecache_2(void *argp, struct svc_req *rqstp)
 {
@@ -265,7 +257,6 @@ nfsproc_writecache_2(void *argp, struct svc_req *rqstp)
 }
 
 
-/*ARGSUSED*/
 struct attrstat *
 nfsproc_write_2(writeargs *argp, struct svc_req *rqstp)
 {
@@ -280,7 +271,6 @@ nfsproc_write_2(writeargs *argp, struct svc_req *rqstp)
 }
 
 
-/*ARGSUSED*/
 struct diropres *
 nfsproc_create_2(createargs *argp, struct svc_req *rqstp)
 {
@@ -295,7 +285,6 @@ nfsproc_create_2(createargs *argp, struct svc_req *rqstp)
 }
 
 
-/*ARGSUSED*/
 static nfsstat *
 unlink_or_rmdir(struct diropargs *argp, struct svc_req *rqstp,
     int unlinkp)
@@ -343,14 +332,12 @@ out:
 }
 
 
-/*ARGSUSED*/
 nfsstat *
 nfsproc_remove_2(struct diropargs *argp, struct svc_req *rqstp)
 {
 	return unlink_or_rmdir(argp, rqstp, TRUE);
 }
 
-/*ARGSUSED*/
 nfsstat *
 nfsproc_rename_2(renameargs *argp, struct svc_req *rqstp)
 {
@@ -372,7 +359,6 @@ nfsproc_rename_2(renameargs *argp, struct svc_req *rqstp)
 }
 
 
-/*ARGSUSED*/
 nfsstat *
 nfsproc_link_2(linkargs *argp, struct svc_req *rqstp)
 {
@@ -386,7 +372,6 @@ nfsproc_link_2(linkargs *argp, struct svc_req *rqstp)
 }
 
 
-/*ARGSUSED*/
 nfsstat *
 nfsproc_symlink_2(symlinkargs *argp, struct svc_req *rqstp)
 {
@@ -400,7 +385,6 @@ nfsproc_symlink_2(symlinkargs *argp, struct svc_req *rqstp)
 }
 
 
-/*ARGSUSED*/
 struct diropres *
 nfsproc_mkdir_2(createargs *argp, struct svc_req *rqstp)
 {
@@ -414,7 +398,6 @@ nfsproc_mkdir_2(createargs *argp, struct svc_req *rqstp)
 }
 
 
-/*ARGSUSED*/
 nfsstat *
 nfsproc_rmdir_2(struct diropargs *argp, struct svc_req *rqstp)
 {
@@ -422,7 +405,6 @@ nfsproc_rmdir_2(struct diropargs *argp, struct svc_req *rqstp)
 }
 
 
-/*ARGSUSED*/
 struct readdirres *
 nfsproc_readdir_2(readdirargs *argp, struct svc_req *rqstp)
 {
@@ -454,7 +436,6 @@ nfsproc_readdir_2(readdirargs *argp, struct svc_req *rqstp)
 	return &res;
 }
 
-/*ARGSUSED*/
 struct statfsres *
 nfsproc_statfs_2(struct nfs_fh *argp, struct svc_req *rqstp)
 {
diff --git a/usr.sbin/amd/amd/opts.c b/usr.sbin/amd/amd/opts.c
index 78587673771..b614223006a 100644
--- a/usr.sbin/amd/amd/opts.c
+++ b/usr.sbin/amd/amd/opts.c
@@ -312,7 +312,6 @@ eval_opts(char *opts, char *mapkey)
 /*
  * Free an option
  */
-/*ARGSUSED*/
 static void
 free_op(opt_apply *p, int b)
 {
diff --git a/usr.sbin/amd/amd/sched.c b/usr.sbin/amd/amd/sched.c
index 17545ea4a77..4c372a27fbd 100644
--- a/usr.sbin/amd/amd/sched.c
+++ b/usr.sbin/amd/amd/sched.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sched.c,v 1.15 2014/10/20 00:20:04 guenther Exp $	*/
+/*	$OpenBSD: sched.c,v 1.16 2014/10/26 02:43:50 guenther Exp $	*/
 
 /*
  * Copyright (c) 1990 Jan-Simon Pendry
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sched.c	8.1 (Berkeley) 6/6/93
- *	$Id: sched.c,v 1.15 2014/10/20 00:20:04 guenther Exp $
+ *	$Id: sched.c,v 1.16 2014/10/26 02:43:50 guenther Exp $
  */
 
 /*
@@ -188,7 +188,6 @@ wakeup_task(int rc, int term, void *cl)
 	wakeup(cl);
 }
 
-/*ARGSUSED*/
 
 void
 sigchld(int sig)
diff --git a/usr.sbin/amd/amd/sfs_ops.c b/usr.sbin/amd/amd/sfs_ops.c
index e7dedefb56e..65ac0fa9972 100644
--- a/usr.sbin/amd/amd/sfs_ops.c
+++ b/usr.sbin/amd/amd/sfs_ops.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sfs_ops.c	8.1 (Berkeley) 6/6/93
- *	$Id: sfs_ops.c,v 1.3 2003/06/02 23:36:51 millert Exp $
+ *	$Id: sfs_ops.c,v 1.4 2014/10/26 02:43:50 guenther Exp $
  */
 
 #include "am.h"
@@ -100,7 +100,6 @@ sfs_match(am_opts *fo)
 #endif
 
 #ifdef HAS_SFSX
-/*ARGUSED*/
 static int
 sfsx_mount(am_node *mp)
 {
@@ -128,7 +127,6 @@ sfsx_mount(am_node *mp)
 #endif
 
 #ifdef HAS_SFS
-/*ARGUSED*/
 static int
 sfs_fmount(mntfs *mf)
 {
@@ -141,7 +139,6 @@ sfs_fmount(mntfs *mf)
 #endif
 
 #ifdef NEED_SFS_UMOUNT
-/*ARGUSED*/
 static int
 sfs_fumount(mntfs *mf)
 {
diff --git a/usr.sbin/amd/amd/srvr_nfs.c b/usr.sbin/amd/amd/srvr_nfs.c
index bbc53d8bad8..f0e26ad0f5f 100644
--- a/usr.sbin/amd/amd/srvr_nfs.c
+++ b/usr.sbin/amd/amd/srvr_nfs.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)srvr_nfs.c	8.1 (Berkeley) 6/6/93
- *	$Id: srvr_nfs.c,v 1.7 2014/10/20 02:33:42 guenther Exp $
+ *	$Id: srvr_nfs.c,v 1.8 2014/10/26 02:43:50 guenther Exp $
  */
 
 /*
@@ -140,7 +140,6 @@ start_ping(void)
 /*
  * Called when a portmap reply arrives
  */
-/*ARGSUSED*/
 static void
 got_portmap(void *pkt, int len, struct sockaddr_in *sa,
     struct sockaddr_in *ia, void *idv, int done)
@@ -253,7 +252,6 @@ recompute_portmap(fserver *fs)
  * The value of id was taken from the nfs_private
  * structure when the ping was transmitted.
  */
-/*ARGSUSED*/
 static void
 nfs_pinged(void *pkt, int len, struct sockaddr_in *sp,
     struct sockaddr_in *tsp, void *idv, int done)
diff --git a/usr.sbin/amd/amd/ufs_ops.c b/usr.sbin/amd/amd/ufs_ops.c
index e7d9b88bf56..2ad7a1ff5b7 100644
--- a/usr.sbin/amd/amd/ufs_ops.c
+++ b/usr.sbin/amd/amd/ufs_ops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs_ops.c,v 1.8 2014/10/20 06:55:59 guenther Exp $	*/
+/*	$OpenBSD: ufs_ops.c,v 1.9 2014/10/26 02:43:50 guenther Exp $	*/
 
 /*
  * Copyright (c) 1990 Jan-Simon Pendry
@@ -102,7 +102,6 @@ mount_ufs(char *dir, char *fs_name, char *opts)
 	return mount_fs(&mnt, flags, (caddr_t) &ufs_args, 0, type);
 }
 
-/*ARGSUSED*/
 static int
 ufs_fmount(mntfs *mf)
 {
diff --git a/usr.sbin/amd/amd/xutil.c b/usr.sbin/amd/amd/xutil.c
index 8af54e771c3..f50113fc0a9 100644
--- a/usr.sbin/amd/amd/xutil.c
+++ b/usr.sbin/amd/amd/xutil.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)xutil.c	8.1 (Berkeley) 6/6/93
- *	$Id: xutil.c,v 1.15 2014/10/26 02:32:51 guenther Exp $
+ *	$Id: xutil.c,v 1.16 2014/10/26 02:43:50 guenther Exp $
  */
 
 #include "config.h"
@@ -223,7 +223,6 @@ extern char **gargv;
 		sev);
 }
 
-/*VARARGS1*/
 void
 plog(int lvl, const char *fmt, ...)
 {