From 98fd709ad7f63e25140bdac904833654da3a66e1 Mon Sep 17 00:00:00 2001 From: Jeroen Ruigrok/asmodai Date: Sun, 26 Sep 2004 15:53:25 +0000 Subject: [PATCH] Make ls compile under WARNS 6. Submitted by: Sascha Wildner --- bin/ls/Makefile | 4 ++-- bin/ls/ls.h | 3 ++- bin/ls/print.c | 4 +--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/bin/ls/Makefile b/bin/ls/Makefile index 817ebab64b..1d5a7a44b7 100644 --- a/bin/ls/Makefile +++ b/bin/ls/Makefile @@ -1,11 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 6/2/93 # $FreeBSD: src/bin/ls/Makefile,v 1.9.2.4 2002/04/19 13:22:45 ru Exp $ -# $DragonFly: src/bin/ls/Makefile,v 1.3 2004/09/26 15:28:02 asmodai Exp $ +# $DragonFly: src/bin/ls/Makefile,v 1.4 2004/09/26 15:53:25 asmodai Exp $ PROG= ls SRCS= cmp.c ls.c print.c util.c -WARNS?= 3 +WARNS?= 6 DPADD= ${LIBM} LDADD= -lm diff --git a/bin/ls/ls.h b/bin/ls/ls.h index 0b1c9aa275..1b43a77fed 100644 --- a/bin/ls/ls.h +++ b/bin/ls/ls.h @@ -36,12 +36,13 @@ * * from: @(#)ls.h 8.1 (Berkeley) 5/31/93 * $FreeBSD: src/bin/ls/ls.h,v 1.11.2.4 2002/07/08 06:59:27 tjr Exp $ - * $DragonFly: src/bin/ls/ls.h,v 1.2 2003/06/17 04:22:50 dillon Exp $ + * $DragonFly: src/bin/ls/ls.h,v 1.3 2004/09/26 15:53:25 asmodai Exp $ */ #define NO_PRINT 1 extern long blocksize; /* block size units */ +extern int termwidth; extern int f_accesstime; /* use time of last access */ extern int f_flags; /* show flags associated with a file */ diff --git a/bin/ls/print.c b/bin/ls/print.c index 7fc67113ef..f67f3be2fa 100644 --- a/bin/ls/print.c +++ b/bin/ls/print.c @@ -35,7 +35,7 @@ * * @(#)print.c 8.4 (Berkeley) 4/17/94 * $FreeBSD: src/bin/ls/print.c,v 1.19.2.7 2002/11/17 10:27:34 tjr Exp $ - * $DragonFly: src/bin/ls/print.c,v 1.5 2004/07/22 11:39:02 asmodai Exp $ + * $DragonFly: src/bin/ls/print.c,v 1.6 2004/09/26 15:53:25 asmodai Exp $ */ #include @@ -218,7 +218,6 @@ void printstream(DISPLAY *dp) { FTSENT *p; - extern int termwidth; int chcnt; for (p = dp->list, chcnt = 0; p; p = p->fts_link) { @@ -242,7 +241,6 @@ printstream(DISPLAY *dp) void printcol(DISPLAY *dp) { - extern int termwidth; static FTSENT **array; static int lastentries = -1; FTSENT *p; -- 2.41.0