lint is dead (long live the lint!), so stop using it as a cpp conditional

(namespace pollution!) or talking about its opinion on code.

ok krw@

21 files changed, 36 insertions, 77 deletions

diff --git a/bin/chio/chio.c b/bin/chio/chio.c
index 22132c431a6..a0a7c57b693 100644
--- a/bin/chio/chio.c
+++ b/bin/chio/chio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chio.c,v 1.24 2012/12/04 02:24:46 deraadt Exp $	*/
+/*	$OpenBSD: chio.c,v 1.25 2014/03/16 18:38:30 guenther Exp $	*/
 /*	$NetBSD: chio.c,v 1.1.1.1 1996/04/03 00:34:38 thorpej Exp $	*/
 
 /*
@@ -484,11 +484,6 @@ do_status(char *cname, int argc, char *argv[])
 	char *description;
 	size_t count;
 
-#ifdef lint
-	count = 0;
-	description = NULL;
-#endif
-
 	optreset = 1;
 	optind = 1;
 	while ((c = getopt(argc, argv, "vVa")) != -1) {
diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c
index df30e703c9f..64a9daf8baf 100644
--- a/bin/chmod/chmod.c
+++ b/bin/chmod/chmod.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chmod.c,v 1.28 2012/12/04 02:24:46 deraadt Exp $	*/
+/*	$OpenBSD: chmod.c,v 1.29 2014/03/16 18:38:30 guenther Exp $	*/
 /*	$NetBSD: chmod.c,v 1.12 1995/03/21 09:02:09 cgd Exp $	*/
 
 /*
@@ -66,10 +66,6 @@ main(int argc, char *argv[])
 	gid_t gid;
 	u_int32_t fclear, fset;
 	char *ep, *mode, *cp, *flags;
-#ifdef lint
-	set = NULL;
-	oct = omode = 0;
-#endif
 
 	setlocale(LC_ALL, "");
 
diff --git a/include/complex.h b/include/complex.h
index a291b3927c3..b29f5a7295e 100644
--- a/include/complex.h
+++ b/include/complex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: complex.h,v 1.4 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: complex.h,v 1.5 2014/03/16 18:38:30 guenther Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -28,8 +28,6 @@
 #define _Complex	__complex__
 #endif
 #define _Complex_I	1.0fi
-#elif defined(lint)
-#define _Complex_I	1.0fi
 #endif
 
 #define complex		_Complex
diff --git a/include/ctype.h b/include/ctype.h
index 57c3a2b64e6..19b269ac39c 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ctype.h,v 1.22 2010/10/01 20:10:24 guenther Exp $	*/
+/*	$OpenBSD: ctype.h,v 1.23 2014/03/16 18:38:30 guenther Exp $	*/
 /*	$NetBSD: ctype.h,v 1.14 1994/10/26 00:55:47 cgd Exp $	*/
 
 /*
@@ -57,7 +57,7 @@ extern const char	*_ctype_;
 extern const short	*_tolower_tab_;
 extern const short	*_toupper_tab_;
 
-#if defined(__GNUC__) || defined(_ANSI_LIBRARY) || defined(lint)
+#if defined(__GNUC__) || defined(_ANSI_LIBRARY)
 int	isalnum(int);
 int	isalpha(int);
 int	iscntrl(int);
@@ -84,9 +84,9 @@ int	_tolower(int);
 int	_toupper(int);
 #endif /* __BSD_VISIBLE || __XPG_VISIBLE */
 
-#endif /* __GNUC__ || _ANSI_LIBRARY || lint */
+#endif /* __GNUC__ || _ANSI_LIBRARY */
 
-#if !defined(_ANSI_LIBRARY) && !defined(lint)
+#if !defined(_ANSI_LIBRARY)
 
 __only_inline int isalnum(int c)
 {
@@ -187,7 +187,7 @@ __only_inline int _toupper(int c)
 }
 #endif /* __BSD_VISIBLE || __XPG_VISIBLE */
 
-#endif /* !_ANSI_LIBRARY && !lint */
+#endif /* !_ANSI_LIBRARY */
 
 __END_DECLS
 
diff --git a/include/signal.h b/include/signal.h
index a29ea54f576..367afea44a1 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.20 2012/12/05 23:19:57 deraadt Exp $	*/
+/*	$OpenBSD: signal.h,v 1.21 2014/03/16 18:38:30 guenther Exp $	*/
 /*	$NetBSD: signal.h,v 1.8 1996/02/29 00:04:57 jtc Exp $	*/
 
 /*-
@@ -67,7 +67,7 @@ int	pthread_sigmask(int, const sigset_t *__restrict, sigset_t *__restrict);
 #endif
 int	sigsuspend(const sigset_t *);
 
-#if !defined(_ANSI_LIBRARY) && !defined(lint)
+#if !defined(_ANSI_LIBRARY)
 
 extern int *__errno(void);
 
@@ -96,7 +96,7 @@ __only_inline int sigismember(const sigset_t *__set, int __signo) {
 	}
 	return ((*__set & (1U << ((__signo)-1))) != 0);
 }
-#endif /* !_ANSI_LIBRARY && !lint */
+#endif /* !_ANSI_LIBRARY */
 
 /* List definitions after function declarations, or Reiser cpp gets upset. */
 #define	sigemptyset(set)	(*(set) = 0, 0)
diff --git a/include/stdbool.h b/include/stdbool.h
index 34304130081..c0b6565078f 100644
--- a/include/stdbool.h
+++ b/include/stdbool.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdbool.h,v 1.5 2010/07/24 22:17:03 guenther Exp $ */
+/* $OpenBSD: stdbool.h,v 1.6 2014/03/16 18:38:30 guenther Exp $ */
 
 /*
  * Written by Marc Espie, September 25, 1999
@@ -10,7 +10,7 @@
 
 #ifndef __cplusplus
 
-#if (defined(__GNUC__) && __GNUC__ >= 3) || defined(__PCC__) || defined(lint)
+#if (defined(__GNUC__) && __GNUC__ >= 3) || defined(__PCC__)
 /* Support for _C99: type _Bool is already built-in. */
 #define false	0
 #define true	1
diff --git a/include/stdio.h b/include/stdio.h
index 76d2ad21ae7..6b90aa4c485 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdio.h,v 1.45 2013/12/04 22:58:24 deraadt Exp $	*/
+/*	$OpenBSD: stdio.h,v 1.46 2014/03/16 18:38:30 guenther Exp $	*/
 /*	$NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $	*/
 
 /*-
@@ -437,7 +437,6 @@ extern int __isthreaded;
 #define putc(x, fp)	(!__isthreaded ? __sputc(x, fp) : (putc)(x, fp))
 #endif /* __BSD_VISIBLE */
 
-#ifndef lint
 #if __POSIX_VISIBLE >= 199506
 #define	getc_unlocked(fp)	__sgetc(fp)
 /*
@@ -448,7 +447,6 @@ extern int __isthreaded;
 #define putc_unlocked(x, fp)	__sputc(x, fp)
 #endif /* __BSD_VISIBLE */
 #endif /* __POSIX_VISIBLE >= 199506 */
-#endif /* lint */
 
 #define	getchar()	getc(stdin)
 #define	putchar(x)	putc(x, stdout)
diff --git a/lib/libc/gen/errlist.c b/lib/libc/gen/errlist.c
index 69607e70900..a1963162c26 100644
--- a/lib/libc/gen/errlist.c
+++ b/lib/libc/gen/errlist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: errlist.c,v 1.14 2009/11/24 09:22:22 guenther Exp $ */
+/*	$OpenBSD: errlist.c,v 1.15 2014/03/16 18:38:30 guenther Exp $ */
 /*
  * Copyright (c) 1982, 1985, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -28,12 +28,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef lint
-char *
-#else
-const char *const
-#endif
-	_sys_errlist[] = {
+const char *const _sys_errlist[] = {
 	"Undefined error: 0",			/*  0 - ENOERROR */
 	"Operation not permitted",		/*  1 - EPERM */
 	"No such file or directory",		/*  2 - ENOENT */
diff --git a/lib/libc/locale/iswctype.c b/lib/libc/locale/iswctype.c
index ee4c82df341..0a557aaac76 100644
--- a/lib/libc/locale/iswctype.c
+++ b/lib/libc/locale/iswctype.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iswctype.c,v 1.3 2012/12/05 23:20:00 deraadt Exp $ */
+/*	$OpenBSD: iswctype.c,v 1.4 2014/03/16 18:38:30 guenther Exp $ */
 /*	$NetBSD: iswctype.c,v 1.15 2005/02/09 21:35:46 kleink Exp $	*/
 
 /*
@@ -45,10 +45,6 @@
 #include "rune_local.h"
 #include "_wctrans_local.h"
 
-#ifdef lint
-#define __inline
-#endif
-
 static __inline _RuneType __runetype_w(wint_t);
 static __inline int __isctype_w(wint_t, _RuneType);
 static __inline wint_t __toupper_w(wint_t);
diff --git a/lib/libc/rpc/xdr.c b/lib/libc/rpc/xdr.c
index fffd81c395e..b3a086d3e74 100644
--- a/lib/libc/rpc/xdr.c
+++ b/lib/libc/rpc/xdr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xdr.c,v 1.11 2010/09/01 14:43:34 millert Exp $ */
+/*	$OpenBSD: xdr.c,v 1.12 2014/03/16 18:38:30 guenther Exp $ */
 
 /*
  * Copyright (c) 2010, Oracle America, Inc.
@@ -409,7 +409,6 @@ xdr_bool(XDR *xdrs, int32_t *bp)
 bool_t
 xdr_enum(XDR *xdrs, int32_t *ep)
 {
-#ifndef lint
 	enum sizecheck { SIZEVAL };	/* used to find the size of an enum */
 
 	/*
@@ -424,11 +423,6 @@ xdr_enum(XDR *xdrs, int32_t *ep)
 	} else {
 		return (FALSE);
 	}
-#else
-	(void) (xdr_short(xdrs, (short *)ep));
-	(void) (xdr_int(xdrs, (int *)ep));
-	return (xdr_long(xdrs, (long *)ep));
-#endif
 }
 
 /*
diff --git a/lib/libc/stdlib/tfind.c b/lib/libc/stdlib/tfind.c
index ff6bcd742da..0d1d5196d8b 100644
--- a/lib/libc/stdlib/tfind.c
+++ b/lib/libc/stdlib/tfind.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: tfind.c,v 1.5 2005/03/30 18:51:49 pat Exp $	*/
+/*	$OpenBSD: tfind.c,v 1.6 2014/03/16 18:38:30 guenther Exp $	*/
 
 /*
  * Tree search generalized from Knuth (6.2.2) Algorithm T just like
  * the AT&T man page says.
  *
- * The node_t structure is for internal use only, lint doesn't grok it.
+ * The node_t structure is for internal use only
  *
  * Written by reading the System V Interface Definition, not the code.
  *
diff --git a/lib/libc/stdlib/tsearch.c b/lib/libc/stdlib/tsearch.c
index 2f5e369f6ad..a141085d2b3 100644
--- a/lib/libc/stdlib/tsearch.c
+++ b/lib/libc/stdlib/tsearch.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: tsearch.c,v 1.7 2012/02/06 20:29:54 guenther Exp $	*/
+/*	$OpenBSD: tsearch.c,v 1.8 2014/03/16 18:38:30 guenther Exp $	*/
 
 /*
  * Tree search generalized from Knuth (6.2.2) Algorithm T just like
  * the AT&T man page says.
  *
- * The node_t structure is for internal use only, lint doesn't grok it.
+ * The node_t structure is for internal use only
  *
  * Written by reading the System V Interface Definition, not the code.
  *
diff --git a/lib/librthread/rthread.c b/lib/librthread/rthread.c
index fa2a28d7ac7..0d1c953d50d 100644
--- a/lib/librthread/rthread.c
+++ b/lib/librthread/rthread.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rthread.c,v 1.76 2013/12/12 08:12:08 guenther Exp $ */
+/*	$OpenBSD: rthread.c,v 1.77 2014/03/16 18:38:30 guenther Exp $ */
 /*
  * Copyright (c) 2004,2005 Ted Unangst <tedu@openbsd.org>
  * All Rights Reserved.
@@ -62,7 +62,6 @@ struct pthread _initial_thread;
 struct thread_control_block _initial_thread_tcb;
 
 struct pthread_attr _rthread_attr_default = {
-#ifndef lint
 	.stack_addr			= NULL,
 	.stack_size			= RTHREAD_STACK_SIZE_DEF,
 /*	.guard_size		set in _rthread_init */
@@ -71,9 +70,6 @@ struct pthread_attr _rthread_attr_default = {
 	.sched_policy			= SCHED_OTHER,
 	.sched_param = { .sched_priority = 0 },
 	.sched_inherit			= PTHREAD_INHERIT_SCHED,
-#else
-	0
-#endif
 };
 
 /*
diff --git a/usr.bin/gprof/dfn.c b/usr.bin/gprof/dfn.c
index 8651f151726..2e8f19d919d 100644
--- a/usr.bin/gprof/dfn.c
+++ b/usr.bin/gprof/dfn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dfn.c,v 1.7 2009/10/27 23:59:38 deraadt Exp $	*/
+/*	$OpenBSD: dfn.c,v 1.8 2014/03/16 18:38:30 guenther Exp $	*/
 /*	$NetBSD: dfn.c,v 1.5 1995/04/19 07:15:56 cgd Exp $	*/
 
 /*
@@ -251,10 +251,9 @@ dfn_findcycle(nltype *childp)
 
     /*
      *	deal with self-cycles
-     *	for lint: ARGSUSED
      */
 void
-dfn_self_cycle(nltype *parentp)
+dfn_self_cycle(nltype *parentp __unused)
 {
 	/*
 	 *	since we are taking out self-cycles elsewhere
diff --git a/usr.bin/lex/main.c b/usr.bin/lex/main.c
index bdc2d80cbfa..4ed4414eaaa 100644
--- a/usr.bin/lex/main.c
+++ b/usr.bin/lex/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.13 2013/10/27 18:31:24 guenther Exp $	*/
+/*	$OpenBSD: main.c,v 1.14 2014/03/16 18:38:30 guenther Exp $	*/
 
 /* flex - tool to generate fast lexical analyzers */
 
@@ -33,7 +33,7 @@
  * PURPOSE.
  */
 
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/main.c,v 1.13 2013/10/27 18:31:24 guenther Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/main.c,v 1.14 2014/03/16 18:38:30 guenther Exp $ */
 
 
 #include "flexdef.h"
@@ -167,7 +167,7 @@ char **argv;
 	 */
 	flexend( 0 );
 
-	return 0;	/* keep compilers/lint happy */
+	return 0;
 	}
 
 
diff --git a/usr.bin/mail/cmd2.c b/usr.bin/mail/cmd2.c
index 6a2eae253ee..53fa175972c 100644
--- a/usr.bin/mail/cmd2.c
+++ b/usr.bin/mail/cmd2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd2.c,v 1.20 2014/01/17 18:42:30 okan Exp $	*/
+/*	$OpenBSD: cmd2.c,v 1.21 2014/03/16 18:38:30 guenther Exp $	*/
 /*	$NetBSD: cmd2.c,v 1.7 1997/05/17 19:55:10 pk Exp $	*/
 
 /*
@@ -313,7 +313,7 @@ delm(int *msgvec)
 	}
 
 	/*
-	 * Following can't happen -- it keeps lint happy
+	 * Following can't happen
 	 */
 	return(-1);
 }
diff --git a/usr.bin/yacc/skeleton.c b/usr.bin/yacc/skeleton.c
index a598dcccff4..28832605a41 100644
--- a/usr.bin/yacc/skeleton.c
+++ b/usr.bin/yacc/skeleton.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: skeleton.c,v 1.34 2014/03/07 19:44:07 tedu Exp $	*/
+/*	$OpenBSD: skeleton.c,v 1.35 2014/03/16 18:38:30 guenther Exp $	*/
 /*	$NetBSD: skeleton.c,v 1.10 1996/03/25 00:36:18 mrg Exp $	*/
 
 /*
@@ -234,12 +234,12 @@ char *body[] =
 	"        goto yyreduce;",
 	"    }",
 	"    if (yyerrflag) goto yyinrecovery;",
-	"#if defined(lint) || defined(__GNUC__)",
+	"#if defined(__GNUC__)",
 	"    goto yynewerror;",
 	"#endif",
 	"yynewerror:",
 	"    yyerror(\"syntax error\");",
-	"#if defined(lint) || defined(__GNUC__)",
+	"#if defined(__GNUC__)",
 	"    goto yyerrlab;",
 	"#endif",
 	"yyerrlab:",
diff --git a/usr.sbin/npppd/common/debugmacro.h b/usr.sbin/npppd/common/debugmacro.h
index 9bbd676a0da..8a9c867adba 100644
--- a/usr.sbin/npppd/common/debugmacro.h
+++ b/usr.sbin/npppd/common/debugmacro.h
@@ -42,12 +42,8 @@
 	    abort(); \
 	}
 #else
-#ifdef lint
-#define ASSERT(x)
-#else
 #define ASSERT(x)	((void)0);
 #endif
 #endif
-#endif
 
 #endif
diff --git a/usr.sbin/portmap/portmap.c b/usr.sbin/portmap/portmap.c
index 228ab76c958..1cd92187d64 100644
--- a/usr.sbin/portmap/portmap.c
+++ b/usr.sbin/portmap/portmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: portmap.c,v 1.41 2010/09/01 14:43:34 millert Exp $	*/
+/*	$OpenBSD: portmap.c,v 1.42 2014/03/16 18:38:30 guenther Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 Theo de Raadt (OpenBSD). All rights reserved.
@@ -258,7 +258,6 @@ main(int argc, char *argv[])
 	abort();
 }
 
-#ifndef lint
 /* need to override perror calls in rpc library */
 void
 perror(const char *what)
@@ -266,7 +265,6 @@ perror(const char *what)
 
 	syslog(LOG_ERR, "%s: %m", what);
 }
-#endif
 
 struct pmaplist *
 find_service(u_long prog, u_long vers, u_long prot)
diff --git a/usr.sbin/relayd/relayd.c b/usr.sbin/relayd/relayd.c
index 894ec2a3652..cb8055190eb 100644
--- a/usr.sbin/relayd/relayd.c
+++ b/usr.sbin/relayd/relayd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relayd.c,v 1.118 2013/11/26 13:27:20 deraadt Exp $	*/
+/*	$OpenBSD: relayd.c,v 1.119 2014/03/16 18:38:30 guenther Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008 Reyk Floeter <reyk@openbsd.org>
@@ -133,7 +133,6 @@ parent_sig_handler(int sig, short event, void *arg)
 	}
 }
 
-/* __dead is for lint */
 __dead void
 usage(void)
 {
diff --git a/usr.sbin/snmpd/snmpd.c b/usr.sbin/snmpd/snmpd.c
index 07a116a76bd..8fa485edf30 100644
--- a/usr.sbin/snmpd/snmpd.c
+++ b/usr.sbin/snmpd/snmpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: snmpd.c,v 1.18 2013/10/17 08:42:44 reyk Exp $	*/
+/*	$OpenBSD: snmpd.c,v 1.19 2014/03/16 18:38:30 guenther Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008, 2012 Reyk Floeter <reyk@openbsd.org>
@@ -83,7 +83,6 @@ snmpd_sig_handler(int sig, short event, void *arg)
 	}
 }
 
-/* __dead is for lint */
 __dead void
 usage(void)
 {