Module Name: src
Committed By: christos
Date: Sun Aug 14 12:30:04 UTC 2011
Modified Files:
src/sbin/fsdb: Makefile fsdb.c
Log Message:
remove gcc-4.5 hacks.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sbin/fsdb/Makefile
cvs rdiff -u -r1.41 -r1.42 src/sbin/fsdb/fsdb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsdb/Makefile
diff -u src/sbin/fsdb/Makefile:1.31 src/sbin/fsdb/Makefile:1.32
--- src/sbin/fsdb/Makefile:1.31 Sun Jul 3 11:29:35 2011
+++ src/sbin/fsdb/Makefile Sun Aug 14 08:30:04 2011
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2011/07/03 15:29:35 mrg Exp $
+# $NetBSD: Makefile,v 1.32 2011/08/14 12:30:04 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
-WARNS?= 3 # XXX: sign-compare issues in ../fsck_ffs
+WARNS?= 4
.include <bsd.own.mk>
@@ -46,9 +46,6 @@
.include <bsd.prog.mk>
# XXX
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 45
-COPTS.fsdb.c+= -Wno-error
-.if ${MACHINE_ARCH} == "vax"
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 45 && ${MACHINE_ARCH} == "vax"
COPTS.fsdb.c+= -O0
.endif
-.endif
Index: src/sbin/fsdb/fsdb.c
diff -u src/sbin/fsdb/fsdb.c:1.41 src/sbin/fsdb/fsdb.c:1.42
--- src/sbin/fsdb/fsdb.c:1.41 Thu Jun 9 17:23:30 2011
+++ src/sbin/fsdb/fsdb.c Sun Aug 14 08:30:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fsdb.c,v 1.41 2011/06/09 21:23:30 christos Exp $ */
+/* $NetBSD: fsdb.c,v 1.42 2011/08/14 12:30:04 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fsdb.c,v 1.41 2011/06/09 21:23:30 christos Exp $");
+__RCSID("$NetBSD: fsdb.c,v 1.42 2011/08/14 12:30:04 christos Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -280,8 +280,7 @@
* el_parse returns -1 to signal that it's not been
* handled internally.
*/
- if (el_parse(elptr, cmd_argc,
- (const char **)cmd_argv) != -1)
+ if (el_parse(elptr, cmd_argc, (void *)cmd_argv) != -1)
continue;
known = 0;
for (cmdp = cmds; cmdp->cmd; cmdp++) {
