lint is dead: delete the trivial uses of /* VARARGS[0-9]+ */

(others require more care)

8 files changed, 9 insertions, 25 deletions

diff --git a/bin/csh/func.c b/bin/csh/func.c
index 54fa044f253..e04439f0db2 100644
--- a/bin/csh/func.c
+++ b/bin/csh/func.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: func.c,v 1.28 2015/02/08 06:09:50 tedu Exp $       */
+/*    $OpenBSD: func.c,v 1.29 2015/09/27 05:25:00 guenther Exp $       */
 /*    $NetBSD: func.c,v 1.11 1996/02/09 02:28:29 christos Exp $       */
 
 /*-
@@ -573,7 +573,6 @@ srchx(Char *cp)
 static Char Stype;
 static Char *Sgoal;
 
-/*VARARGS2*/
 static void
 search(int type, int level, Char *goal)
 {
diff --git a/bin/ksh/tree.c b/bin/ksh/tree.c
index b87f14b9b8b..dba66d8b25b 100644
--- a/bin/ksh/tree.c
+++ b/bin/ksh/tree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tree.c,v 1.23 2015/09/17 14:21:33 nicm Exp $	*/
+/*	$OpenBSD: tree.c,v 1.24 2015/09/27 05:25:00 guenther Exp $	*/
 
 /*
  * command tree climbing
@@ -348,11 +348,6 @@ tputS(char *wp, struct shf *shf)
 		}
 }
 
-/*
- * this is the _only_ way to reliably handle
- * variable args with an ANSI compiler
- */
-/* VARARGS */
 void
 fptreef(struct shf *shf, int indent, const char *fmt, ...)
 {
@@ -363,7 +358,6 @@ fptreef(struct shf *shf, int indent, const char *fmt, ...)
   va_end(va);
 }
 
-/* VARARGS */
 char *
 snptreef(char *s, int n, const char *fmt, ...)
 {
diff --git a/lib/libcurses/base/vsscanf.c b/lib/libcurses/base/vsscanf.c
index 0a283e30c9c..de14ffa4252 100644
--- a/lib/libcurses/base/vsscanf.c
+++ b/lib/libcurses/base/vsscanf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vsscanf.c,v 1.1 2010/01/12 23:22:06 nicm Exp $ */
+/* $OpenBSD: vsscanf.c,v 1.2 2015/09/27 05:25:00 guenther Exp $ */
 
 /****************************************************************************
  * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
@@ -40,7 +40,7 @@
 
 #if !HAVE_VSSCANF
 
-MODULE_ID("$Id: vsscanf.c,v 1.1 2010/01/12 23:22:06 nicm Exp $")
+MODULE_ID("$Id: vsscanf.c,v 1.2 2015/09/27 05:25:00 guenther Exp $")
 
 #if !(HAVE_VFSCANF || HAVE__DOSCAN)
 
@@ -161,7 +161,6 @@ other_ch(int ch)
 }
 #endif
 
-/*VARARGS2*/
 NCURSES_EXPORT(int)
 vsscanf(const char *str, const char *format, va_list ap)
 {
diff --git a/lib/libpcap/gencode.c b/lib/libpcap/gencode.c
index da7ef341994..51e30ab8490 100644
--- a/lib/libpcap/gencode.c
+++ b/lib/libpcap/gencode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gencode.c,v 1.40 2015/01/16 16:48:51 deraadt Exp $	*/
+/*	$OpenBSD: gencode.c,v 1.41 2015/09/27 05:25:00 guenther Exp $	*/
 
 /*
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998
@@ -77,7 +77,6 @@ int	pcap_fddipad = PCAP_FDDIPAD;
 int	pcap_fddipad;
 #endif
 
-/* VARARGS */
 __dead void
 bpf_error(const char *fmt, ...)
 {
diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c
index 703872b5f78..4246a6e8240 100644
--- a/sbin/fsck/fsutil.c
+++ b/sbin/fsck/fsutil.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsutil.c,v 1.21 2015/05/29 15:57:36 deraadt Exp $	*/
+/*	$OpenBSD: fsutil.c,v 1.22 2015/09/27 05:25:00 guenther Exp $	*/
 /*	$NetBSD: fsutil.c,v 1.2 1996/10/03 20:06:31 christos Exp $	*/
 
 /*
@@ -73,7 +73,6 @@ hotroot(void)
 	return hot;
 }
 
-/*VARARGS*/
 void
 errexit(const char *fmt, ...)
 {
@@ -109,7 +108,6 @@ vmsg(int fatal, const char *fmt, va_list ap)
 	}
 }
 
-/*VARARGS*/
 void
 pfatal(const char *fmt, ...)
 {
@@ -120,7 +118,6 @@ pfatal(const char *fmt, ...)
 	va_end(ap);
 }
 
-/*VARARGS*/
 void
 pwarn(const char *fmt, ...)
 {
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 2e63d12b64f..87840a18699 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_alloc.c,v 1.104 2015/03/14 03:38:52 jsg Exp $	*/
+/*	$OpenBSD: ffs_alloc.c,v 1.105 2015/09/27 05:25:00 guenther Exp $	*/
 /*	$NetBSD: ffs_alloc.c,v 1.11 1996/05/11 18:27:09 mycroft Exp $	*/
 
 /*
@@ -1266,7 +1266,6 @@ ffs2_blkpref(struct inode *ip, daddr_t lbn, int indx, int64_t *bap)
  *   2) quadratically rehash on the cylinder group number.
  *   3) brute force search for a free block.
  */
-/*VARARGS5*/
 daddr_t
 ffs_hashalloc(struct inode *ip, int cg, daddr_t pref, int size,
     daddr_t (*allocator)(struct inode *, int, daddr_t, int))
diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c
index 86268adb687..8989a8bebea 100644
--- a/usr.bin/ftp/ftp.c
+++ b/usr.bin/ftp/ftp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ftp.c,v 1.91 2015/02/09 08:24:20 tedu Exp $	*/
+/*	$OpenBSD: ftp.c,v 1.92 2015/09/27 05:25:01 guenther Exp $	*/
 /*	$NetBSD: ftp.c,v 1.27 1997/08/18 10:20:23 lukem Exp $	*/
 
 /*
@@ -319,7 +319,6 @@ cmdabort(int signo)
 		longjmp(ptabort, 1);
 }
 
-/*VARARGS*/
 int
 command(const char *fmt, ...)
 {
diff --git a/usr.sbin/tcpdump/util.c b/usr.sbin/tcpdump/util.c
index 15921ff078d..d227f078e59 100644
--- a/usr.sbin/tcpdump/util.c
+++ b/usr.sbin/tcpdump/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.25 2009/10/27 23:59:57 deraadt Exp $	*/
+/*	$OpenBSD: util.c,v 1.26 2015/09/27 05:25:01 guenther Exp $	*/
 
 /*
  * Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997
@@ -204,7 +204,6 @@ tok2str(register const struct tok *lp, register const char *fmt,
 }
 
 
-/* VARARGS */
 __dead void
 error(const char *fmt, ...)
 {
@@ -219,7 +218,6 @@ error(const char *fmt, ...)
 	/* NOTREACHED */
 }
 
-/* VARARGS */
 void
 warning(const char *fmt, ...)
 {