From 167c036e91fb24a62d627d16a2f3afa6d875c9e2 Mon Sep 17 00:00:00 2001 From: archie Date: Sun, 6 Dec 1998 22:58:23 +0000 Subject: Tweaks to allow compiling -Wall (mostly adding "const" to char rcsid[]). --- usr.bin/apply/Makefile | 1 + usr.bin/apply/apply.c | 2 +- usr.bin/banner/Makefile | 1 + usr.bin/banner/banner.c | 4 ++-- usr.bin/basename/Makefile | 1 + usr.bin/basename/basename.c | 4 ++-- usr.bin/biff/Makefile | 1 + usr.bin/biff/biff.c | 6 +++--- usr.bin/brandelf/Makefile | 1 + usr.bin/cap_mkdb/Makefile | 1 + usr.bin/cap_mkdb/cap_mkdb.c | 4 ++-- usr.bin/chat/Makefile | 3 ++- usr.bin/chat/chat.c | 3 ++- usr.bin/checknr/Makefile | 1 + usr.bin/checknr/checknr.c | 4 ++-- usr.bin/chflags/Makefile | 1 + usr.bin/chflags/chflags.c | 4 ++-- usr.bin/chpass/Makefile | 1 + usr.bin/chpass/chpass.c | 12 ++++++------ usr.bin/chpass/edit.c | 4 ++-- usr.bin/chpass/field.c | 2 +- usr.bin/chpass/table.c | 2 +- usr.bin/cksum/Makefile | 1 + usr.bin/cksum/crc.c | 2 +- usr.bin/cksum/print.c | 2 +- usr.bin/cksum/sum1.c | 2 +- usr.bin/cksum/sum2.c | 2 +- usr.bin/cmp/Makefile | 1 + usr.bin/cmp/cmp.c | 4 ++-- usr.bin/cmp/misc.c | 2 +- usr.bin/cmp/regular.c | 2 +- usr.bin/cmp/special.c | 2 +- usr.bin/col/Makefile | 1 + usr.bin/col/col.c | 4 ++-- usr.bin/colcrt/Makefile | 1 + usr.bin/colcrt/colcrt.c | 4 ++-- usr.bin/colldef/Makefile | 3 ++- usr.bin/colldef/parse.y | 6 +++++- usr.bin/colrm/Makefile | 1 + usr.bin/colrm/colrm.c | 6 +++--- usr.bin/column/Makefile | 1 + usr.bin/column/column.c | 14 +++++++------- usr.bin/comm/Makefile | 1 + usr.bin/comm/comm.c | 6 +++--- usr.bin/compress/Makefile | 1 + usr.bin/compress/compress.c | 4 ++-- usr.bin/compress/zopen.c | 5 +++-- usr.bin/ctags/Makefile | 1 + usr.bin/ctags/ctags.c | 4 ++-- usr.bin/ctags/fortran.c | 2 +- usr.bin/ctags/lisp.c | 2 +- usr.bin/ctags/print.c | 2 +- usr.bin/ctags/tree.c | 2 +- usr.bin/ctags/yacc.c | 2 +- usr.bin/cut/Makefile | 1 + usr.bin/cut/cut.c | 10 +++++----- usr.bin/dirname/Makefile | 1 + usr.bin/dirname/dirname.c | 4 ++-- usr.bin/du/Makefile | 1 + usr.bin/du/du.c | 4 ++-- usr.bin/ee/Makefile | 1 + usr.bin/ee/ee.c | 10 +++++----- usr.bin/enigma/Makefile | 1 + usr.bin/env/Makefile | 1 + usr.bin/env/env.c | 4 ++-- usr.bin/error/Makefile | 1 + usr.bin/error/pi.c | 4 ++-- usr.bin/error/touch.c | 4 ++-- usr.bin/expand/Makefile | 1 + usr.bin/expand/expand.c | 4 ++-- 70 files changed, 121 insertions(+), 87 deletions(-) (limited to 'usr.bin') diff --git a/usr.bin/apply/Makefile b/usr.bin/apply/Makefile index 59f358e..05823ea 100644 --- a/usr.bin/apply/Makefile +++ b/usr.bin/apply/Makefile @@ -1,5 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= apply +CFLAGS+=-Wall .include diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c index 37a77b7..3f0727d 100644 --- a/usr.bin/apply/apply.c +++ b/usr.bin/apply/apply.c @@ -35,7 +35,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)apply.c 8.4 (Berkeley) 4/4/94"; +static const char sccsid[] = "@(#)apply.c 8.4 (Berkeley) 4/4/94"; #endif /* not lint */ #include diff --git a/usr.bin/banner/Makefile b/usr.bin/banner/Makefile index 54a3ad5..c04e68ae6 100644 --- a/usr.bin/banner/Makefile +++ b/usr.bin/banner/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= banner +CFLAGS+=-Wall MAN6= banner.6 .include diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c index 13a2849..15a2952 100644 --- a/usr.bin/banner/banner.c +++ b/usr.bin/banner/banner.c @@ -32,13 +32,13 @@ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1980, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)banner.c 8.4 (Berkeley) 4/29/95"; +static const char sccsid[] = "@(#)banner.c 8.4 (Berkeley) 4/29/95"; #endif /* not lint */ /* diff --git a/usr.bin/basename/Makefile b/usr.bin/basename/Makefile index 21354bd..d74d670 100644 --- a/usr.bin/basename/Makefile +++ b/usr.bin/basename/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= basename +CFLAGS+=-Wall MLINKS= basename.1 dirname.1 .include diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c index 5964013..1a6aa48 100644 --- a/usr.bin/basename/basename.c +++ b/usr.bin/basename/basename.c @@ -32,13 +32,13 @@ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1991, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)basename.c 8.4 (Berkeley) 5/4/95"; +static const char sccsid[] = "@(#)basename.c 8.4 (Berkeley) 5/4/95"; #endif /* not lint */ #include diff --git a/usr.bin/biff/Makefile b/usr.bin/biff/Makefile index 81cb86b..db26fc4 100644 --- a/usr.bin/biff/Makefile +++ b/usr.bin/biff/Makefile @@ -1,5 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= biff +CFLAGS+=-Wall .include diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c index 52f5229..185d634 100644 --- a/usr.bin/biff/biff.c +++ b/usr.bin/biff/biff.c @@ -30,17 +30,17 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: biff.c,v 1.3 1997/06/23 06:45:38 charnier Exp $ + * $Id: biff.c,v 1.4 1997/12/29 00:08:50 alex Exp $ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1980, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)biff.c 8.1 (Berkeley) 6/6/93"; +static const char sccsid[] = "@(#)biff.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #include diff --git a/usr.bin/brandelf/Makefile b/usr.bin/brandelf/Makefile index 3561ec0..81d0039 100644 --- a/usr.bin/brandelf/Makefile +++ b/usr.bin/brandelf/Makefile @@ -1,3 +1,4 @@ PROG= brandelf +CFLAGS+=-Wall .include diff --git a/usr.bin/cap_mkdb/Makefile b/usr.bin/cap_mkdb/Makefile index 0e403af..88a34d7 100644 --- a/usr.bin/cap_mkdb/Makefile +++ b/usr.bin/cap_mkdb/Makefile @@ -1,5 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= cap_mkdb +CFLAGS+=-Wall .include diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c index 91c2222..f28d8db 100644 --- a/usr.bin/cap_mkdb/cap_mkdb.c +++ b/usr.bin/cap_mkdb/cap_mkdb.c @@ -32,13 +32,13 @@ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1992, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)cap_mkdb.c 8.1 (Berkeley) 6/6/93"; +static const char sccsid[] = "@(#)cap_mkdb.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #include diff --git a/usr.bin/chat/Makefile b/usr.bin/chat/Makefile index ab4129e..1154024 100644 --- a/usr.bin/chat/Makefile +++ b/usr.bin/chat/Makefile @@ -1,6 +1,7 @@ -# $Id: Makefile,v 1.4 1997/02/22 19:54:21 peter Exp $ +# $Id: Makefile,v 1.5 1997/08/22 15:42:31 peter Exp $ PROG= chat +CFLAGS+=-Wall SRCS= chat.c MAN8= chat.8 diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c index f3676aa0..c25b8cf 100644 --- a/usr.bin/chat/chat.c +++ b/usr.bin/chat/chat.c @@ -78,7 +78,8 @@ */ #ifndef lint -static char rcsid[] = "$Id: chat.c,v 1.11 1998/03/21 20:47:04 peter Exp $"; +static const char rcsid[] = + "$Id: chat.c,v 1.12 1998/06/23 21:58:41 peter Exp $"; #endif #include diff --git a/usr.bin/checknr/Makefile b/usr.bin/checknr/Makefile index c265248..85e4c48 100644 --- a/usr.bin/checknr/Makefile +++ b/usr.bin/checknr/Makefile @@ -1,5 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= checknr +CFLAGS+=-Wall .include diff --git a/usr.bin/checknr/checknr.c b/usr.bin/checknr/checknr.c index f8531cc..743ed04 100644 --- a/usr.bin/checknr/checknr.c +++ b/usr.bin/checknr/checknr.c @@ -32,13 +32,13 @@ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1980, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)checknr.c 8.1 (Berkeley) 6/6/93"; +static const char sccsid[] = "@(#)checknr.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ /* diff --git a/usr.bin/chflags/Makefile b/usr.bin/chflags/Makefile index d269255..d05ff81 100644 --- a/usr.bin/chflags/Makefile +++ b/usr.bin/chflags/Makefile @@ -3,6 +3,7 @@ NOSHARED?=yes PROG= chflags +CFLAGS+=-Wall SRCS= chflags.c stat_flags.c .PATH: ${.CURDIR}/../../bin/ls diff --git a/usr.bin/chflags/chflags.c b/usr.bin/chflags/chflags.c index f33f46e..6646094 100644 --- a/usr.bin/chflags/chflags.c +++ b/usr.bin/chflags/chflags.c @@ -32,13 +32,13 @@ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1992, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)chflags.c 8.5 (Berkeley) 4/1/94"; +static const char sccsid[] = "@(#)chflags.c 8.5 (Berkeley) 4/1/94"; #endif /* not lint */ #include diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile index f19a257..3abed82 100644 --- a/usr.bin/chpass/Makefile +++ b/usr.bin/chpass/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.2 (Berkeley) 4/2/94 PROG= chpass +CFLAGS+=-Wall SRCS= chpass.c edit.c field.c pw_copy.c pw_scan.c pw_util.c pw_yp.c \ table.c util.c ypxfr_misc.c ${GENSRCS} GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c yppasswd_private.h \ diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c index 982548f..2809f8b 100644 --- a/usr.bin/chpass/chpass.c +++ b/usr.bin/chpass/chpass.c @@ -32,15 +32,15 @@ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1988, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "From: @(#)chpass.c 8.4 (Berkeley) 4/2/94"; -static char rcsid[] = - "$Id: chpass.c,v 1.13 1997/02/22 19:54:25 peter Exp $"; +static const char sccsid[] = "From: @(#)chpass.c 8.4 (Berkeley) 4/2/94"; +static const char rcsid[] = + "$Id: chpass.c,v 1.14 1997/03/29 04:28:38 imp Exp $"; #endif /* not lint */ #include @@ -83,10 +83,10 @@ main(argc, argv) char **argv; { enum { NEWSH, LOADENTRY, EDITENTRY, NEWPW, NEWEXP } op; - struct passwd *pw, lpw; + struct passwd *pw = NULL, lpw; char *username = NULL; int ch, pfd, tfd; - char *arg; + char *arg = NULL; #ifdef YP int force_local = 0; int force_yp = 0; diff --git a/usr.bin/chpass/edit.c b/usr.bin/chpass/edit.c index 68dbc0e..9cae42e 100644 --- a/usr.bin/chpass/edit.c +++ b/usr.bin/chpass/edit.c @@ -30,11 +30,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: edit.c,v 1.10 1997/06/25 06:59:55 charnier Exp $ + * $Id: edit.c,v 1.11 1998/08/14 03:18:32 thepish Exp $ */ #ifndef lint -static char sccsid[] = "@(#)edit.c 8.3 (Berkeley) 4/2/94"; +static const char sccsid[] = "@(#)edit.c 8.3 (Berkeley) 4/2/94"; #endif /* not lint */ #include diff --git a/usr.bin/chpass/field.c b/usr.bin/chpass/field.c index 73fa479..997d21f 100644 --- a/usr.bin/chpass/field.c +++ b/usr.bin/chpass/field.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)field.c 8.4 (Berkeley) 4/2/94"; +static const char sccsid[] = "@(#)field.c 8.4 (Berkeley) 4/2/94"; #endif /* not lint */ #include diff --git a/usr.bin/chpass/table.c b/usr.bin/chpass/table.c index eed097e..1bc857b 100644 --- a/usr.bin/chpass/table.c +++ b/usr.bin/chpass/table.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)table.c 8.3 (Berkeley) 4/2/94"; +static const char sccsid[] = "@(#)table.c 8.3 (Berkeley) 4/2/94"; #endif /* not lint */ #include diff --git a/usr.bin/cksum/Makefile b/usr.bin/cksum/Makefile index f4fa373..4c1d027 100644 --- a/usr.bin/cksum/Makefile +++ b/usr.bin/cksum/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.2 (Berkeley) 4/28/95 PROG= cksum +CFLAGS+=-Wall SRCS= cksum.c crc.c print.c sum1.c sum2.c crc32.c LINKS= ${BINDIR}/cksum ${BINDIR}/sum MLINKS= cksum.1 sum.1 diff --git a/usr.bin/cksum/crc.c b/usr.bin/cksum/crc.c index 3526395..0dde11d 100644 --- a/usr.bin/cksum/crc.c +++ b/usr.bin/cksum/crc.c @@ -35,7 +35,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)crc.c 8.1 (Berkeley) 6/17/93"; +static const char sccsid[] = "@(#)crc.c 8.1 (Berkeley) 6/17/93"; #endif /* not lint */ #include diff --git a/usr.bin/cksum/print.c b/usr.bin/cksum/print.c index 48c38aa..b3a92d3 100644 --- a/usr.bin/cksum/print.c +++ b/usr.bin/cksum/print.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 6/6/93"; +static const char sccsid[] = "@(#)print.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #include diff --git a/usr.bin/cksum/sum1.c b/usr.bin/cksum/sum1.c index 1975ee2..a46a575 100644 --- a/usr.bin/cksum/sum1.c +++ b/usr.bin/cksum/sum1.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)sum1.c 8.1 (Berkeley) 6/6/93"; +static const char sccsid[] = "@(#)sum1.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #include diff --git a/usr.bin/cksum/sum2.c b/usr.bin/cksum/sum2.c index 7922050..11abb2c 100644 --- a/usr.bin/cksum/sum2.c +++ b/usr.bin/cksum/sum2.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)sum2.c 8.1 (Berkeley) 6/6/93"; +static const char sccsid[] = "@(#)sum2.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #include diff --git a/usr.bin/cmp/Makefile b/usr.bin/cmp/Makefile index 1b84ce3..1ff3af6 100644 --- a/usr.bin/cmp/Makefile +++ b/usr.bin/cmp/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= cmp +CFLAGS+=-Wall SRCS= cmp.c misc.c regular.c special.c .include diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c index da269d8..a4f4d88 100644 --- a/usr.bin/cmp/cmp.c +++ b/usr.bin/cmp/cmp.c @@ -32,13 +32,13 @@ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1987, 1990, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)cmp.c 8.3 (Berkeley) 4/2/94"; +static const char sccsid[] = "@(#)cmp.c 8.3 (Berkeley) 4/2/94"; #endif /* not lint */ #include diff --git a/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c index d5a601d..248ef93 100644 --- a/usr.bin/cmp/misc.c +++ b/usr.bin/cmp/misc.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94"; +static const char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94"; #endif /* not lint */ #include diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c index f540ab4..3b82bae 100644 --- a/usr.bin/cmp/regular.c +++ b/usr.bin/cmp/regular.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)regular.c 8.3 (Berkeley) 4/2/94"; +static const char sccsid[] = "@(#)regular.c 8.3 (Berkeley) 4/2/94"; #endif /* not lint */ #include diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c index 0a15fa1..b843cc8 100644 --- a/usr.bin/cmp/special.c +++ b/usr.bin/cmp/special.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)special.c 8.3 (Berkeley) 4/2/94"; +static const char sccsid[] = "@(#)special.c 8.3 (Berkeley) 4/2/94"; #endif /* not lint */ #include diff --git a/usr.bin/col/Makefile b/usr.bin/col/Makefile index efa0933..9edab17 100644 --- a/usr.bin/col/Makefile +++ b/usr.bin/col/Makefile @@ -1,5 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= col +CFLAGS+=-Wall .include diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c index 88d024e..8d26faa 100644 --- a/usr.bin/col/col.c +++ b/usr.bin/col/col.c @@ -35,13 +35,13 @@ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1990, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)col.c 8.5 (Berkeley) 5/4/95"; +static const char sccsid[] = "@(#)col.c 8.5 (Berkeley) 5/4/95"; #endif /* not lint */ #include diff --git a/usr.bin/colcrt/Makefile b/usr.bin/colcrt/Makefile index e03ab0c..9bb24b7 100644 --- a/usr.bin/colcrt/Makefile +++ b/usr.bin/colcrt/Makefile @@ -1,5 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= colcrt +CFLAGS+=-Wall .include diff --git a/usr.bin/colcrt/colcrt.c b/usr.bin/colcrt/colcrt.c index 40fe5ce..e6dc445 100644 --- a/usr.bin/colcrt/colcrt.c +++ b/usr.bin/colcrt/colcrt.c @@ -32,13 +32,13 @@ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1980, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)colcrt.c 8.1 (Berkeley) 6/6/93"; +static const char sccsid[] = "@(#)colcrt.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #include diff --git a/usr.bin/colldef/Makefile b/usr.bin/colldef/Makefile index 474bf7b..ccb5e98 100644 --- a/usr.bin/colldef/Makefile +++ b/usr.bin/colldef/Makefile @@ -1,7 +1,8 @@ -# $Id: Makefile,v 1.12 1998/05/04 20:09:02 bde Exp $ +# $Id: Makefile,v 1.13 1998/05/05 13:16:22 bde Exp $ PROG = colldef LFLAGS = -8 -i +CFLAGS += -Wall CFLAGS += -I. -I${.CURDIR}/../../lib/libc/locale -DCOLLATE_DEBUG SRCS = parse.y scan.l y.tab.h LDADD = -ll diff --git a/usr.bin/colldef/parse.y b/usr.bin/colldef/parse.y index e316e1c..cfc5642 100644 --- a/usr.bin/colldef/parse.y +++ b/usr.bin/colldef/parse.y @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: parse.y,v 1.9 1997/06/26 11:25:17 charnier Exp $ + * $Id: parse.y,v 1.10 1997/06/30 11:24:18 charnier Exp $ */ #include @@ -40,6 +40,8 @@ extern int line_no; extern FILE *yyin; void yyerror(char *fmt, ...); +int yyparse(void); +int yylex(void); static void usage __P((void)); char map_name[FILENAME_MAX] = "."; @@ -208,6 +210,7 @@ sec_sub_item : CHAR { } ; %% +int main(ac, av) char **av; { @@ -268,6 +271,7 @@ void yyerror(char *fmt, ...) } #ifdef COLLATE_DEBUG +void collate_print_tables() { int i; diff --git a/usr.bin/colrm/Makefile b/usr.bin/colrm/Makefile index b9c8341..7413d42 100644 --- a/usr.bin/colrm/Makefile +++ b/usr.bin/colrm/Makefile @@ -1,5 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= colrm +CFLAGS+=-Wall .include diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c index 1195300..2c9e0e4 100644 --- a/usr.bin/colrm/colrm.c +++ b/usr.bin/colrm/colrm.c @@ -30,17 +30,17 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: colrm.c,v 1.4 1997/06/30 11:05:42 charnier Exp $ + * $Id: colrm.c,v 1.5 1997/12/29 00:08:59 alex Exp $ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1991, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)colrm.c 8.2 (Berkeley) 5/4/95"; +static const char sccsid[] = "@(#)colrm.c 8.2 (Berkeley) 5/4/95"; #endif /* not lint */ #include diff --git a/usr.bin/column/Makefile b/usr.bin/column/Makefile index 1c304e2..33de9f6 100644 --- a/usr.bin/column/Makefile +++ b/usr.bin/column/Makefile @@ -1,5 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= column +CFLAGS+=-Wall .include diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c index cf8c7a9..043ab9d 100644 --- a/usr.bin/column/column.c +++ b/usr.bin/column/column.c @@ -32,13 +32,13 @@ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1989, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)column.c 8.4 (Berkeley) 5/4/95"; +static const char sccsid[] = "@(#)column.c 8.4 (Berkeley) 5/4/95"; #endif /* not lint */ #include @@ -79,7 +79,7 @@ main(argc, argv) char *p; if (ioctl(1, TIOCGWINSZ, &win) == -1 || !win.ws_col) { - if (p = getenv("COLUMNS")) + if ((p = getenv("COLUMNS"))) termwidth = atoi(p); } else termwidth = win.ws_col; @@ -109,7 +109,7 @@ main(argc, argv) if (!*argv) input(stdin); else for (; *argv; ++argv) - if (fp = fopen(*argv, "r")) { + if ((fp = fopen(*argv, "r"))) { input(fp); (void)fclose(fp); } else { @@ -150,7 +150,7 @@ c_columnate() endcol = maxlength; putchar('\n'); } else { - while ((cnt = (chcnt + TAB & ~(TAB - 1))) <= endcol) { + while ((cnt = ((chcnt + TAB) & ~(TAB - 1))) <= endcol) { (void)putchar('\t'); chcnt = cnt; } @@ -178,7 +178,7 @@ r_columnate() chcnt += printf("%s", list[base]); if ((base += numrows) >= entries) break; - while ((cnt = (chcnt + TAB & ~(TAB - 1))) <= endcol) { + while ((cnt = ((chcnt + TAB) & ~(TAB - 1))) <= endcol) { (void)putchar('\t'); chcnt = cnt; } @@ -218,7 +218,7 @@ maketbl() cols = emalloc((maxcols = DEFCOLS) * sizeof(char *)); lens = emalloc(maxcols * sizeof(int)); for (cnt = 0, lp = list; cnt < entries; ++cnt, ++lp, ++t) { - for (coloff = 0, p = *lp; cols[coloff] = strtok(p, separator); + for (coloff = 0, p = *lp; (cols[coloff] = strtok(p, separator)); p = NULL) if (++coloff == maxcols) { if (!(cols = realloc(cols, (u_int)maxcols + diff --git a/usr.bin/comm/Makefile b/usr.bin/comm/Makefile index 6942023..d311527 100644 --- a/usr.bin/comm/Makefile +++ b/usr.bin/comm/Makefile @@ -1,5 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= comm +CFLAGS+=-Wall .include diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c index debbb0b..70e7c0d 100644 --- a/usr.bin/comm/comm.c +++ b/usr.bin/comm/comm.c @@ -35,7 +35,7 @@ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1989, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ @@ -45,7 +45,7 @@ static char copyright[] = static char sccsid[] = "From: @(#)comm.c 8.4 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$Id$"; + "$Id: comm.c,v 1.4 1997/09/07 15:09:17 joerg Exp $"; #endif /* not lint */ #include @@ -69,7 +69,7 @@ main(argc, argv) int argc; char *argv[]; { - int comp, file1done, file2done, read1, read2; + int comp, file1done = 0, file2done = 0, read1, read2; int ch, flag1, flag2, flag3, iflag; FILE *fp1, *fp2; char *col1, *col2, *col3; diff --git a/usr.bin/compress/Makefile b/usr.bin/compress/Makefile index 0f6f5dd..02f7fbb 100644 --- a/usr.bin/compress/Makefile +++ b/usr.bin/compress/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.2 (Berkeley) 4/17/94 PROG= compress +CFLAGS+=-Wall SRCS= compress.c zopen.c LINKS= ${BINDIR}/compress ${BINDIR}/uncompress MLINKS= compress.1 uncompress.1 diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c index 5e323d3..e819635 100644 --- a/usr.bin/compress/compress.c +++ b/usr.bin/compress/compress.c @@ -32,13 +32,13 @@ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1992, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)compress.c 8.2 (Berkeley) 1/7/94"; +static const char sccsid[] = "@(#)compress.c 8.2 (Berkeley) 1/7/94"; #endif /* not lint */ #include diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c index 5e5357b..abe31f2 100644 --- a/usr.bin/compress/zopen.c +++ b/usr.bin/compress/zopen.c @@ -388,7 +388,7 @@ output(zs, ocode) * Since ocode is always >= 8 bits, only need to mask the first * hunk on the left. */ - *bp = (*bp & rmask[r_off]) | (ocode << r_off) & lmask[r_off]; + *bp = (*bp & rmask[r_off]) | ((ocode << r_off) & lmask[r_off]); bp++; bits -= (8 - r_off); ocode >>= 8 - r_off; @@ -698,7 +698,7 @@ zopen(fname, mode, bits) { struct s_zstate *zs; - if (mode[0] != 'r' && mode[0] != 'w' || mode[1] != '\0' || + if ((mode[0] != 'r' && mode[0] != 'w') || mode[1] != '\0' || bits < 0 || bits > BITS) { errno = EINVAL; return (NULL); @@ -738,4 +738,5 @@ zopen(fname, mode, bits) return (funopen(zs, NULL, zwrite, NULL, zclose)); } /* NOTREACHED */ + return (NULL); } diff --git a/usr.bin/ctags/Makefile b/usr.bin/ctags/Makefile index 7a8ebce..db595aa 100644 --- a/usr.bin/ctags/Makefile +++ b/usr.bin/ctags/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= ctags +CFLAGS+=-Wall CFLAGS+=-I${.CURDIR} SRCS= C.c ctags.c fortran.c lisp.c print.c tree.c yacc.c diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c index 421d819..dc44ba6 100644 --- a/usr.bin/ctags/ctags.c +++ b/usr.bin/ctags/ctags.c @@ -32,13 +32,13 @@ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1987, 1993, 1994, 1995\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)ctags.c 8.4 (Berkeley) 2/7/95"; +static const char sccsid[] = "@(#)ctags.c 8.4 (Berkeley) 2/7/95"; #endif /* not lint */ #include diff --git a/usr.bin/ctags/fortran.c b/usr.bin/ctags/fortran.c index 0706b49..d4b2723 100644 --- a/usr.bin/ctags/fortran.c +++ b/usr.bin/ctags/fortran.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)fortran.c 8.3 (Berkeley) 4/2/94"; +static const char sccsid[] = "@(#)fortran.c 8.3 (Berkeley) 4/2/94"; #endif /* not lint */ #include diff --git a/usr.bin/ctags/lisp.c b/usr.bin/ctags/lisp.c index 5f99984..f86e218 100644 --- a/usr.bin/ctags/lisp.c +++ b/usr.bin/ctags/lisp.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)lisp.c 8.3 (Berkeley) 4/2/94"; +static const char sccsid[] = "@(#)lisp.c 8.3 (Berkeley) 4/2/94"; #endif /* not lint */ #include diff --git a/usr.bin/ctags/print.c b/usr.bin/ctags/print.c index bebdeb1..65d6737 100644 --- a/usr.bin/ctags/print.c +++ b/usr.bin/ctags/print.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)print.c 8.3 (Berkeley) 4/2/94"; +static const char sccsid[] = "@(#)print.c 8.3 (Berkeley) 4/2/94"; #endif /* not lint */ #include diff --git a/usr.bin/ctags/tree.c b/usr.bin/ctags/tree.c index 61decd2..8e1ec22 100644 --- a/usr.bin/ctags/tree.c +++ b/usr.bin/ctags/tree.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)tree.c 8.3 (Berkeley) 4/2/94"; +static const char sccsid[] = "@(#)tree.c 8.3 (Berkeley) 4/2/94"; #endif /* not lint */ #include diff --git a/usr.bin/ctags/yacc.c b/usr.bin/ctags/yacc.c index 1ed4c7d..7a27a6e 100644 --- a/usr.bin/ctags/yacc.c +++ b/usr.bin/ctags/yacc.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)yacc.c 8.3 (Berkeley) 4/2/94"; +static const char sccsid[] = "@(#)yacc.c 8.3 (Berkeley) 4/2/94"; #endif /* not lint */ #include diff --git a/usr.bin/cut/Makefile b/usr.bin/cut/Makefile index 19b0100..a3467c8 100644 --- a/usr.bin/cut/Makefile +++ b/usr.bin/cut/Makefile @@ -1,5 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= cut +CFLAGS+=-Wall .include diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c index cc57685..168e7b6 100644 --- a/usr.bin/cut/cut.c +++ b/usr.bin/cut/cut.c @@ -35,13 +35,13 @@ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1989, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)cut.c 8.3 (Berkeley) 5/4/95"; +static const char sccsid[] = "@(#)cut.c 8.3 (Berkeley) 5/4/95"; #endif /* not lint */ #include @@ -70,7 +70,7 @@ main(argc, argv) char *argv[]; { FILE *fp; - void (*fcn) __P((FILE *, char *)); + void (*fcn) __P((FILE *, char *)) = NULL; int ch; dchar = '\t'; /* default delimiter is \t */ @@ -139,7 +139,7 @@ get_list(list) * overlapping lists. We also handle "-3-5" although there's no * real reason too. */ - for (; p = strtok(list, ", \t"); list = NULL) { + for (; (p = strtok(list, ", \t")); list = NULL) { setautostart = start = stop = 0; if (*p == '-') { ++p; @@ -186,7 +186,7 @@ c_cut(fp, fname) FILE *fp; char *fname; { - register int ch, col; + register int ch = 0, col; register char *pos; for (;;) { diff --git a/usr.bin/dirname/Makefile b/usr.bin/dirname/Makefile index 76b4089..0350db6 100644 --- a/usr.bin/dirname/Makefile +++ b/usr.bin/dirname/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= dirname +CFLAGS+=-Wall NOMAN= noman .include diff --git a/usr.bin/dirname/dirname.c b/usr.bin/dirname/dirname.c index c6ca326..056dc51 100644 --- a/usr.bin/dirname/dirname.c +++ b/usr.bin/dirname/dirname.c @@ -32,13 +32,13 @@ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1991, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)dirname.c 8.4 (Berkeley) 5/4/95"; +static const char sccsid[] = "@(#)dirname.c 8.4 (Berkeley) 5/4/95"; #endif /* not lint */ #include diff --git a/usr.bin/du/Makefile b/usr.bin/du/Makefile index 3b5f135..0911b8f 100644 --- a/usr.bin/du/Makefile +++ b/usr.bin/du/Makefile @@ -1,5 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= du +CFLAGS+=-Wall .include diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c index 0c806cf..ee19f45 100644 --- a/usr.bin/du/du.c +++ b/usr.bin/du/du.c @@ -35,13 +35,13 @@ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1989, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)du.c 8.5 (Berkeley) 5/4/95"; +static const char sccsid[] = "@(#)du.c 8.5 (Berkeley) 5/4/95"; #endif /* not lint */ diff --git a/usr.bin/ee/Makefile b/usr.bin/ee/Makefile index 0848847..859d53b 100644 --- a/usr.bin/ee/Makefile +++ b/usr.bin/ee/Makefile @@ -2,6 +2,7 @@ CFLAGS+= -DCAP -DHAS_NCURSES -DHAS_UNISTD -DHAS_STDARG -DHAS_STDLIB \ -DHAS_CTYPE -DHAS_SYS_IOCTL -DHAS_SYS_WAIT -DSLCT_HDR PROG= ee +CFLAGS+=-Wall LINKS= ${BINDIR}/ee ${BINDIR}/ree MLINKS= ee.1 ree.1 DPADD= ${LIBNCURSES} ${LIBMYTINFO} diff --git a/usr.bin/ee/ee.c b/usr.bin/ee/ee.c index 485afea..bb38c70 100644 --- a/usr.bin/ee/ee.c +++ b/usr.bin/ee/ee.c @@ -52,7 +52,7 @@ #ifndef lint static const char rcsid[] = - "$Id: ee.c,v 1.10 1998/04/30 12:49:11 ache Exp $"; + "$Id: ee.c,v 1.11 1998/10/01 21:18:18 obrien Exp $"; #endif /* not lint */ char *ee_copyright_message = @@ -64,7 +64,7 @@ char *ee_long_notice[] = { "copyright. All rights are reserved." }; -char *version = "@(#) ee, version 1.3 $Revision: 1.10 $"; +char *version = "@(#) ee, version 1.3 $Revision: 1.11 $"; #ifdef NCURSE #include "new_curse.h" @@ -1897,7 +1897,7 @@ char *cmd_str; int number; int i; char *ptr; - char *direction; + char *direction = NULL; struct text *t_line; ptr = cmd_str; @@ -1968,7 +1968,7 @@ char *arguments[]; { char *buff; int count; - struct files *temp_names; + struct files *temp_names = NULL; char *name; char *ptr; @@ -3192,7 +3192,7 @@ struct menu_entries menu_list[]; int counter; int length; int input; - int temp; + int temp = 0; int list_size; int top_offset; /* offset from top where menu items start */ int vert_pos; /* vertical position */ diff --git a/usr.bin/enigma/Makefile b/usr.bin/enigma/Makefile index 4044708..6936b7e 100644 --- a/usr.bin/enigma/Makefile +++ b/usr.bin/enigma/Makefile @@ -1,4 +1,5 @@ PROG= enigma +CFLAGS+=-Wall MAN1= enigma.1 LINKS= ${BINDIR}/enigma ${BINDIR}/crypt diff --git a/usr.bin/env/Makefile b/usr.bin/env/Makefile index 6b67b73..fadfd08 100644 --- a/usr.bin/env/Makefile +++ b/usr.bin/env/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= env +CFLAGS+=-Wall NOMAN= noman .include diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c index 8894dd0..a5083fb 100644 --- a/usr.bin/env/env.c +++ b/usr.bin/env/env.c @@ -32,13 +32,13 @@ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1988, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)env.c 8.3 (Berkeley) 4/2/94"; +static const char sccsid[] = "@(#)env.c 8.3 (Berkeley) 4/2/94"; #endif /* not lint */ #include diff --git a/usr.bin/error/Makefile b/usr.bin/error/Makefile index 4ec0ba0..3bd5adf 100644 --- a/usr.bin/error/Makefile +++ b/usr.bin/error/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= error +CFLAGS+=-Wall SRCS= main.c input.c pi.c subr.c filter.c touch.c .include diff --git a/usr.bin/error/pi.c b/usr.bin/error/pi.c index 5984bca..c5c1ffb 100644 --- a/usr.bin/error/pi.c +++ b/usr.bin/error/pi.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)pi.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$Id$"; + "$Id: pi.c,v 1.3 1997/11/03 07:44:15 charnier Exp $"; #endif /* not lint */ #include @@ -208,7 +208,7 @@ extern char **wordv; Errorclass pi() { - char **nwordv; + char **nwordv = NULL; if (wordc < 2) return (C_UNKNOWN); diff --git a/usr.bin/error/touch.c b/usr.bin/error/touch.c index cef09fd..08952f7 100644 --- a/usr.bin/error/touch.c +++ b/usr.bin/error/touch.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)touch.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$Id: touch.c,v 1.4 1997/11/03 07:44:25 charnier Exp $"; + "$Id: touch.c,v 1.5 1998/02/25 02:24:04 bde Exp $"; #endif /* not lint */ #include @@ -512,7 +512,7 @@ execvarg(n_pissed_on, r_argc, r_argv) char ***r_argv; { Eptr p; - char *sep; + char *sep = NULL; int fi; (*r_argv) = (char **)Calloc(n_pissed_on + 3, sizeof(char *)); diff --git a/usr.bin/expand/Makefile b/usr.bin/expand/Makefile index 751df25..8e1369c 100644 --- a/usr.bin/expand/Makefile +++ b/usr.bin/expand/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/9/93 PROG= expand +CFLAGS+=-Wall MLINKS= expand.1 unexpand.1 .include diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c index 37c9464..a8014f9 100644 --- a/usr.bin/expand/expand.c +++ b/usr.bin/expand/expand.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1980, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ @@ -42,7 +42,7 @@ static char copyright[] = static char sccsid[] = "@(#)expand.c 8.1 (Berkeley) 6/9/93"; #else static const char rcsid[] = - "$Id: expand.c,v 1.2 1997/07/01 06:34:31 charnier Exp $"; + "$Id: expand.c,v 1.3 1998/02/02 07:10:59 cwt Exp $"; #endif #endif /* not lint */ -- cgit v1.1