Module Name: src
Committed By: joerg
Date: Tue Mar 13 22:37:51 UTC 2012
Modified Files:
src/lib/libc: Makefile.inc
src/lib/libc/compat/gen: compat___fts13.c compat___fts30.c compat_fts.c
Log Message:
Fix all the issues lint is too dumb to warn about and re-enable
-Wconstant-conversion.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/compat/gen/compat___fts13.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/compat/gen/compat___fts30.c \
src/lib/libc/compat/gen/compat_fts.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/Makefile.inc
diff -u src/lib/libc/Makefile.inc:1.10 src/lib/libc/Makefile.inc:1.11
--- src/lib/libc/Makefile.inc:1.10 Tue Mar 13 22:12:40 2012
+++ src/lib/libc/Makefile.inc Tue Mar 13 22:37:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2012/03/13 22:12:40 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.11 2012/03/13 22:37:51 joerg Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#
# All library objects contain sccsid strings by default; they may be
@@ -25,7 +25,6 @@ USE_SHLIBDIR= yes
WARNS=4
CPPFLAGS+= -D_LIBC -DLIBC_SCCS -DSYSLIBC_SCCS -D_REENTRANT -D_DIAGNOSTIC
-CWARNFLAGS+= -Wno-constant-conversion
.if (${USE_HESIOD} != "no")
CPPFLAGS+= -DHESIOD
Index: src/lib/libc/compat/gen/compat___fts13.c
diff -u src/lib/libc/compat/gen/compat___fts13.c:1.7 src/lib/libc/compat/gen/compat___fts13.c:1.8
--- src/lib/libc/compat/gen/compat___fts13.c:1.7 Tue Mar 13 21:13:31 2012
+++ src/lib/libc/compat/gen/compat___fts13.c Tue Mar 13 22:37:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: compat___fts13.c,v 1.7 2012/03/13 21:13:31 christos Exp $ */
+/* $NetBSD: compat___fts13.c,v 1.8 2012/03/13 22:37:51 joerg Exp $ */
#include "namespace.h"
#include <sys/cdefs.h>
@@ -33,10 +33,12 @@ __warn_references(__fts_set13,
#define __fts_dev_t uint32_t
#define __fts_level_t short
-#ifndef fts_namelen_truncate
+#undef fts_namelen_truncate
#define fts_namelen_truncate(a) \
((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
-#endif
+#undef fts_pathlen_truncate
+#define ftsent_pathlen_truncate(a) \
+ ((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
#define stat __stat13
#define lstat __lstat13
Index: src/lib/libc/compat/gen/compat___fts30.c
diff -u src/lib/libc/compat/gen/compat___fts30.c:1.4 src/lib/libc/compat/gen/compat___fts30.c:1.5
--- src/lib/libc/compat/gen/compat___fts30.c:1.4 Tue Mar 13 21:13:31 2012
+++ src/lib/libc/compat/gen/compat___fts30.c Tue Mar 13 22:37:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: compat___fts30.c,v 1.4 2012/03/13 21:13:31 christos Exp $ */
+/* $NetBSD: compat___fts30.c,v 1.5 2012/03/13 22:37:51 joerg Exp $ */
#include "namespace.h"
#include <sys/cdefs.h>
@@ -40,6 +40,9 @@ __warn_references(__fts_set30,
#define fts_namelen_truncate(a) \
((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
#endif
+#undef fts_pathlen_truncate
+#define ftsent_pathlen_truncate(a) \
+ ((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
#undef fts_children
#define fts_children __fts_children30
Index: src/lib/libc/compat/gen/compat_fts.c
diff -u src/lib/libc/compat/gen/compat_fts.c:1.4 src/lib/libc/compat/gen/compat_fts.c:1.5
--- src/lib/libc/compat/gen/compat_fts.c:1.4 Mon Oct 19 17:52:05 2009
+++ src/lib/libc/compat/gen/compat_fts.c Tue Mar 13 22:37:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_fts.c,v 1.4 2009/10/19 17:52:05 christos Exp $ */
+/* $NetBSD: compat_fts.c,v 1.5 2012/03/13 22:37:51 joerg Exp $ */
/*
* Written by Jason R. Thorpe <[email protected]>, October 21, 1997.
@@ -22,6 +22,13 @@
#define __fts_dev_t uint32_t
#define __fts_level_t short
+#undef fts_namelen_truncate
+#define fts_namelen_truncate(a) \
+ ((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
+#undef fts_pathlen_truncate
+#define ftsent_pathlen_truncate(a) \
+ ((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
+
#include <fts.h>
#include <compat/include/fts.h>
