mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-04 23:35:36 -08:00
Code

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

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

ok krw@
This commit is contained in:
guenther 2014-03-16 18:38:30 +00:00
parent febc818197
commit acf82b0a9d
21 changed files with 36 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/chio/chio.c
View File

@ -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 $ */ /* $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; char *description;
size_t count; size_t count;
#ifdef lint
count = 0;
description = NULL;
#endif
optreset = 1; optreset = 1;
optind = 1; optind = 1;
while ((c = getopt(argc, argv, "vVa")) != -1) { while ((c = getopt(argc, argv, "vVa")) != -1) {

6
bin/chmod/chmod.c
View File

@ -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 $ */ /* $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; gid_t gid;
u_int32_t fclear, fset; u_int32_t fclear, fset;
char *ep, *mode, *cp, *flags; char *ep, *mode, *cp, *flags;
#ifdef lint
set = NULL;
oct = omode = 0;
#endif
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");

4
include/complex.h
View File

@ -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> * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
* *
@ -28,8 +28,6 @@
#define _Complex __complex__ #define _Complex __complex__
#endif #endif
#define _Complex_I 1.0fi #define _Complex_I 1.0fi
#elif defined(lint)
#define _Complex_I 1.0fi
#endif #endif
#define complex _Complex #define complex _Complex

10
include/ctype.h
View File

@ -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 $ */ /* $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 *_tolower_tab_;
extern const short *_toupper_tab_; extern const short *_toupper_tab_;
#if defined(__GNUC__) || defined(_ANSI_LIBRARY) || defined(lint) #if defined(__GNUC__) || defined(_ANSI_LIBRARY)
int isalnum(int); int isalnum(int);
int isalpha(int); int isalpha(int);
int iscntrl(int); int iscntrl(int);
@ -84,9 +84,9 @@ int _tolower(int);
int _toupper(int); int _toupper(int);
#endif /* __BSD_VISIBLE || __XPG_VISIBLE */ #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) __only_inline int isalnum(int c)
{ {
@ -187,7 +187,7 @@ __only_inline int _toupper(int c)
} }
#endif /* __BSD_VISIBLE || __XPG_VISIBLE */ #endif /* __BSD_VISIBLE || __XPG_VISIBLE */
#endif /* !_ANSI_LIBRARY && !lint */ #endif /* !_ANSI_LIBRARY */
__END_DECLS __END_DECLS

6
include/signal.h
View File

@ -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 $ */ /* $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 #endif
int sigsuspend(const sigset_t *); int sigsuspend(const sigset_t *);
#if !defined(_ANSI_LIBRARY) && !defined(lint) #if !defined(_ANSI_LIBRARY)
extern int *__errno(void); extern int *__errno(void);
@ -96,7 +96,7 @@ __only_inline int sigismember(const sigset_t *__set, int __signo) {
} }
return ((*__set & (1U << ((__signo)-1))) != 0); return ((*__set & (1U << ((__signo)-1))) != 0);
} }
#endif /* !_ANSI_LIBRARY && !lint */ #endif /* !_ANSI_LIBRARY */
/* List definitions after function declarations, or Reiser cpp gets upset. */ /* List definitions after function declarations, or Reiser cpp gets upset. */
#define sigemptyset(set) (*(set) = 0, 0) #define sigemptyset(set) (*(set) = 0, 0)

4
include/stdbool.h
View File

@ -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 * Written by Marc Espie, September 25, 1999
@ -10,7 +10,7 @@
#ifndef __cplusplus #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. */ /* Support for _C99: type _Bool is already built-in. */
#define false 0 #define false 0
#define true 1 #define true 1

4
include/stdio.h
View File

@ -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 $ */ /* $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)) #define putc(x, fp) (!__isthreaded ? __sputc(x, fp) : (putc)(x, fp))
#endif /* __BSD_VISIBLE */ #endif /* __BSD_VISIBLE */
#ifndef lint
#if __POSIX_VISIBLE >= 199506 #if __POSIX_VISIBLE >= 199506
#define getc_unlocked(fp) __sgetc(fp) #define getc_unlocked(fp) __sgetc(fp)
/* /*
@ -448,7 +447,6 @@ extern int __isthreaded;
#define putc_unlocked(x, fp) __sputc(x, fp) #define putc_unlocked(x, fp) __sputc(x, fp)
#endif /* __BSD_VISIBLE */ #endif /* __BSD_VISIBLE */
#endif /* __POSIX_VISIBLE >= 199506 */ #endif /* __POSIX_VISIBLE >= 199506 */
#endif /* lint */
#define getchar() getc(stdin) #define getchar() getc(stdin)
#define putchar(x) putc(x, stdout) #define putchar(x) putc(x, stdout)

9
lib/libc/gen/errlist.c
View File

@ -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 * Copyright (c) 1982, 1985, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.
@ -28,12 +28,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifdef lint const char *const _sys_errlist[] = {
char *
#else
const char *const
#endif
_sys_errlist[] = {
"Undefined error: 0", /* 0 - ENOERROR */ "Undefined error: 0", /* 0 - ENOERROR */
"Operation not permitted", /* 1 - EPERM */ "Operation not permitted", /* 1 - EPERM */
"No such file or directory", /* 2 - ENOENT */ "No such file or directory", /* 2 - ENOENT */

6
lib/libc/locale/iswctype.c
View File

@ -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 $ */ /* $NetBSD: iswctype.c,v 1.15 2005/02/09 21:35:46 kleink Exp $ */
/* /*
@ -45,10 +45,6 @@
#include "rune_local.h" #include "rune_local.h"
#include "_wctrans_local.h" #include "_wctrans_local.h"
#ifdef lint
#define __inline
#endif
static __inline _RuneType __runetype_w(wint_t); static __inline _RuneType __runetype_w(wint_t);
static __inline int __isctype_w(wint_t, _RuneType); static __inline int __isctype_w(wint_t, _RuneType);
static __inline wint_t __toupper_w(wint_t); static __inline wint_t __toupper_w(wint_t);

8
lib/libc/rpc/xdr.c
View File

@ -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. * Copyright (c) 2010, Oracle America, Inc.
@ -409,7 +409,6 @@ xdr_bool(XDR *xdrs, int32_t *bp)
bool_t bool_t
xdr_enum(XDR *xdrs, int32_t *ep) xdr_enum(XDR *xdrs, int32_t *ep)
{ {
#ifndef lint
enum sizecheck { SIZEVAL }; /* used to find the size of an enum */ enum sizecheck { SIZEVAL }; /* used to find the size of an enum */
/* /*
@ -424,11 +423,6 @@ xdr_enum(XDR *xdrs, int32_t *ep)
} else { } else {
return (FALSE); return (FALSE);
} }
#else
(void) (xdr_short(xdrs, (short *)ep));
(void) (xdr_int(xdrs, (int *)ep));
return (xdr_long(xdrs, (long *)ep));
#endif
} }
/* /*

4
lib/libc/stdlib/tfind.c
View File

@ -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 * Tree search generalized from Knuth (6.2.2) Algorithm T just like
* the AT&T man page says. * 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. * Written by reading the System V Interface Definition, not the code.
* *

4
lib/libc/stdlib/tsearch.c
View File

@ -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 * Tree search generalized from Knuth (6.2.2) Algorithm T just like
* the AT&T man page says. * 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. * Written by reading the System V Interface Definition, not the code.
* *

6
lib/librthread/rthread.c
View File

@ -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> * Copyright (c) 2004,2005 Ted Unangst <tedu@openbsd.org>
* All Rights Reserved. * All Rights Reserved.
@ -62,7 +62,6 @@ struct pthread _initial_thread;
struct thread_control_block _initial_thread_tcb; struct thread_control_block _initial_thread_tcb;
struct pthread_attr _rthread_attr_default = { struct pthread_attr _rthread_attr_default = {
#ifndef lint
.stack_addr = NULL, .stack_addr = NULL,
.stack_size = RTHREAD_STACK_SIZE_DEF, .stack_size = RTHREAD_STACK_SIZE_DEF,
/* .guard_size set in _rthread_init */ /* .guard_size set in _rthread_init */
@ -71,9 +70,6 @@ struct pthread_attr _rthread_attr_default = {
.sched_policy = SCHED_OTHER, .sched_policy = SCHED_OTHER,
.sched_param = { .sched_priority = 0 }, .sched_param = { .sched_priority = 0 },
.sched_inherit = PTHREAD_INHERIT_SCHED, .sched_inherit = PTHREAD_INHERIT_SCHED,
#else
0
#endif
}; };
/* /*

5
usr.bin/gprof/dfn.c
View File

@ -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 $ */ /* $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 * deal with self-cycles
* for lint: ARGSUSED
*/ */
void void
dfn_self_cycle(nltype *parentp) dfn_self_cycle(nltype *parentp __unused)
{ {
/* /*
* since we are taking out self-cycles elsewhere * since we are taking out self-cycles elsewhere

6
usr.bin/lex/main.c
View File

@ -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 */ /* flex - tool to generate fast lexical analyzers */
@ -33,7 +33,7 @@
* PURPOSE. * PURPOSE.
*/ */
/* $Header: /home/cvs/src/usr.bin/lex/main.c,v 1.13 2013/10/27 18:31:24 guenther Exp $ */ /* $Header: /home/cvs/src/usr.bin/lex/main.c,v 1.14 2014/03/16 18:38:30 guenther Exp $ */
#include "flexdef.h" #include "flexdef.h"
@ -167,7 +167,7 @@ char **argv;
*/ */
flexend( 0 ); flexend( 0 );
return 0; /* keep compilers/lint happy */ return 0;
} }

4
usr.bin/mail/cmd2.c
View File

@ -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 $ */ /* $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); return(-1);
} }

6
usr.bin/yacc/skeleton.c
View File

@ -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 $ */ /* $NetBSD: skeleton.c,v 1.10 1996/03/25 00:36:18 mrg Exp $ */
/* /*
@ -234,12 +234,12 @@ char *body[] =
" goto yyreduce;", " goto yyreduce;",
" }", " }",
" if (yyerrflag) goto yyinrecovery;", " if (yyerrflag) goto yyinrecovery;",
"#if defined(lint) || defined(__GNUC__)", "#if defined(__GNUC__)",
" goto yynewerror;", " goto yynewerror;",
"#endif", "#endif",
"yynewerror:", "yynewerror:",
" yyerror(\"syntax error\");", " yyerror(\"syntax error\");",
"#if defined(lint) || defined(__GNUC__)", "#if defined(__GNUC__)",
" goto yyerrlab;", " goto yyerrlab;",
"#endif", "#endif",
"yyerrlab:", "yyerrlab:",

4
usr.sbin/npppd/common/debugmacro.h
View File

@ -42,12 +42,8 @@
abort(); \ abort(); \
} }
#else #else
#ifdef lint
#define ASSERT(x)
#else
#define ASSERT(x) ((void)0); #define ASSERT(x) ((void)0);
#endif #endif
#endif #endif
#endif
#endif #endif

4
usr.sbin/portmap/portmap.c
View File

@ -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. * Copyright (c) 1996, 1997 Theo de Raadt (OpenBSD). All rights reserved.
@ -258,7 +258,6 @@ main(int argc, char *argv[])
abort(); abort();
} }
#ifndef lint
/* need to override perror calls in rpc library */ /* need to override perror calls in rpc library */
void void
perror(const char *what) perror(const char *what)
@ -266,7 +265,6 @@ perror(const char *what)
syslog(LOG_ERR, "%s: %m", what); syslog(LOG_ERR, "%s: %m", what);
} }
#endif
struct pmaplist * struct pmaplist *
find_service(u_long prog, u_long vers, u_long prot) find_service(u_long prog, u_long vers, u_long prot)

3
usr.sbin/relayd/relayd.c
View File

@ -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> * 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 __dead void
usage(void) usage(void)
{ {

3
usr.sbin/snmpd/snmpd.c
View File

@ -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> * 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 __dead void
usage(void) usage(void)
{ {