mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-26 11:47:31 +00:00
Tweaks to allow compiling -Wall (mostly adding "const" to char rcsid[]).
This commit is contained in:
parent
872963ff95
commit
fa146c5335
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=41568
@ -3,6 +3,7 @@
|
||||
NOSHARED?=yes
|
||||
|
||||
PROG= chflags
|
||||
CFLAGS+=-Wall
|
||||
SRCS= chflags.c stat_flags.c
|
||||
.PATH: ${.CURDIR}/../../bin/ls
|
||||
|
||||
|
@ -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 <sys/types.h>
|
||||
|
@ -1,5 +1,6 @@
|
||||
# @(#)Makefile 8.1 (Berkeley) 6/6/93
|
||||
|
||||
PROG= apply
|
||||
CFLAGS+=-Wall
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -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 <sys/wait.h>
|
||||
|
@ -1,6 +1,7 @@
|
||||
# @(#)Makefile 8.1 (Berkeley) 6/6/93
|
||||
|
||||
PROG= banner
|
||||
CFLAGS+=-Wall
|
||||
MAN6= banner.6
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -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 */
|
||||
|
||||
/*
|
||||
|
@ -1,6 +1,7 @@
|
||||
# @(#)Makefile 8.1 (Berkeley) 6/6/93
|
||||
|
||||
PROG= basename
|
||||
CFLAGS+=-Wall
|
||||
MLINKS= basename.1 dirname.1
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -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 <stdio.h>
|
||||
|
@ -1,5 +1,6 @@
|
||||
# @(#)Makefile 8.1 (Berkeley) 6/6/93
|
||||
|
||||
PROG= biff
|
||||
CFLAGS+=-Wall
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -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 <sys/types.h>
|
||||
|
@ -1,3 +1,4 @@
|
||||
PROG= brandelf
|
||||
CFLAGS+=-Wall
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -1,5 +1,6 @@
|
||||
# @(#)Makefile 8.1 (Berkeley) 6/6/93
|
||||
|
||||
PROG= cap_mkdb
|
||||
CFLAGS+=-Wall
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -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 <sys/param.h>
|
||||
|
@ -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
|
||||
|
||||
|
@ -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 <stdio.h>
|
||||
|
@ -1,5 +1,6 @@
|
||||
# @(#)Makefile 8.1 (Berkeley) 6/6/93
|
||||
|
||||
PROG= checknr
|
||||
CFLAGS+=-Wall
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -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 */
|
||||
|
||||
/*
|
||||
|
@ -3,6 +3,7 @@
|
||||
NOSHARED?=yes
|
||||
|
||||
PROG= chflags
|
||||
CFLAGS+=-Wall
|
||||
SRCS= chflags.c stat_flags.c
|
||||
.PATH: ${.CURDIR}/../../bin/ls
|
||||
|
||||
|
@ -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 <sys/types.h>
|
||||
|
@ -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 \
|
||||
|
@ -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 <sys/param.h>
|
||||
@ -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;
|
||||
|
@ -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 <sys/param.h>
|
||||
|
@ -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 <sys/param.h>
|
||||
|
@ -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 <sys/types.h>
|
||||
|
@ -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
|
||||
|
@ -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 <sys/types.h>
|
||||
|
@ -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 <sys/types.h>
|
||||
|
@ -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 <sys/types.h>
|
||||
|
@ -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 <sys/types.h>
|
||||
|
@ -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 <bsd.prog.mk>
|
||||
|
@ -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 <sys/types.h>
|
||||
|
@ -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 <sys/types.h>
|
||||
|
@ -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 <sys/param.h>
|
||||
|
@ -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 <sys/types.h>
|
||||
|
@ -1,5 +1,6 @@
|
||||
# @(#)Makefile 8.1 (Berkeley) 6/6/93
|
||||
|
||||
PROG= col
|
||||
CFLAGS+=-Wall
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -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 <ctype.h>
|
||||
|
@ -1,5 +1,6 @@
|
||||
# @(#)Makefile 8.1 (Berkeley) 6/6/93
|
||||
|
||||
PROG= colcrt
|
||||
CFLAGS+=-Wall
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -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 <err.h>
|
||||
|
@ -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
|
||||
|
@ -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 <err.h>
|
||||
@ -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;
|
||||
|
@ -1,5 +1,6 @@
|
||||
# @(#)Makefile 8.1 (Berkeley) 6/6/93
|
||||
|
||||
PROG= colrm
|
||||
CFLAGS+=-Wall
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -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 <sys/types.h>
|
||||
|
@ -1,5 +1,6 @@
|
||||
# @(#)Makefile 8.1 (Berkeley) 6/6/93
|
||||
|
||||
PROG= column
|
||||
CFLAGS+=-Wall
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -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 <sys/types.h>
|
||||
@ -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 +
|
||||
|
@ -1,5 +1,6 @@
|
||||
# @(#)Makefile 8.1 (Berkeley) 6/6/93
|
||||
|
||||
PROG= comm
|
||||
CFLAGS+=-Wall
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -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 <err.h>
|
||||
@ -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;
|
||||
|
@ -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
|
||||
|
@ -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 <sys/param.h>
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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
|
||||
|
||||
|
@ -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 <err.h>
|
||||
|
@ -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 <ctype.h>
|
||||
|
@ -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 <ctype.h>
|
||||
|
@ -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 <limits.h>
|
||||
|
@ -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 <err.h>
|
||||
|
@ -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 <ctype.h>
|
||||
|
@ -1,5 +1,6 @@
|
||||
# @(#)Makefile 8.1 (Berkeley) 6/6/93
|
||||
|
||||
PROG= cut
|
||||
CFLAGS+=-Wall
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -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 <ctype.h>
|
||||
@ -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 (;;) {
|
||||
|
@ -1,6 +1,7 @@
|
||||
# @(#)Makefile 8.1 (Berkeley) 6/6/93
|
||||
|
||||
PROG= dirname
|
||||
CFLAGS+=-Wall
|
||||
NOMAN= noman
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -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 <stdio.h>
|
||||
|
@ -1,5 +1,6 @@
|
||||
# @(#)Makefile 8.1 (Berkeley) 6/6/93
|
||||
|
||||
PROG= du
|
||||
CFLAGS+=-Wall
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -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 */
|
||||
|
||||
|
||||
|
@ -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}
|
||||
|
@ -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 */
|
||||
|
@ -1,4 +1,5 @@
|
||||
PROG= enigma
|
||||
CFLAGS+=-Wall
|
||||
MAN1= enigma.1
|
||||
|
||||
LINKS= ${BINDIR}/enigma ${BINDIR}/crypt
|
||||
|
1
usr.bin/env/Makefile
vendored
1
usr.bin/env/Makefile
vendored
@ -1,6 +1,7 @@
|
||||
# @(#)Makefile 8.1 (Berkeley) 6/6/93
|
||||
|
||||
PROG= env
|
||||
CFLAGS+=-Wall
|
||||
NOMAN= noman
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
4
usr.bin/env/env.c
vendored
4
usr.bin/env/env.c
vendored
@ -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 <err.h>
|
||||
|
@ -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 <bsd.prog.mk>
|
||||
|
@ -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 <ctype.h>
|
||||
@ -208,7 +208,7 @@ extern char **wordv;
|
||||
|
||||
Errorclass pi()
|
||||
{
|
||||
char **nwordv;
|
||||
char **nwordv = NULL;
|
||||
|
||||
if (wordc < 2)
|
||||
return (C_UNKNOWN);
|
||||
|
@ -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 <sys/types.h>
|
||||
@ -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 *));
|
||||
|
@ -1,6 +1,7 @@
|
||||
# @(#)Makefile 8.1 (Berkeley) 6/9/93
|
||||
|
||||
PROG= expand
|
||||
CFLAGS+=-Wall
|
||||
MLINKS= expand.1 unexpand.1
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -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 */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user