Module Name: src
Committed By: dholland
Date: Sat Aug 6 16:42:41 UTC 2011
Modified Files:
src/sbin/fsck_ext2fs: Makefile pass5.c
Log Message:
Avoid -Wno-pointer-sign.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sbin/fsck_ext2fs/Makefile
cvs rdiff -u -r1.18 -r1.19 src/sbin/fsck_ext2fs/pass5.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/fsck_ext2fs/Makefile
diff -u src/sbin/fsck_ext2fs/Makefile:1.15 src/sbin/fsck_ext2fs/Makefile:1.16
--- src/sbin/fsck_ext2fs/Makefile:1.15 Mon Jun 20 07:44:00 2011
+++ src/sbin/fsck_ext2fs/Makefile Sat Aug 6 16:42:41 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/06/20 07:44:00 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2011/08/06 16:42:41 dholland Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
.include <bsd.own.mk>
@@ -15,9 +15,3 @@
LDADD+=-lutil
DPADD+=${LIBUTIL}
-
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
-.for f in pass5 utilities
-COPTS.${f}.c+= -Wno-pointer-sign
-.endfor
-.endif
Index: src/sbin/fsck_ext2fs/pass5.c
diff -u src/sbin/fsck_ext2fs/pass5.c:1.18 src/sbin/fsck_ext2fs/pass5.c:1.19
--- src/sbin/fsck_ext2fs/pass5.c:1.18 Sat Aug 6 16:39:40 2011
+++ src/sbin/fsck_ext2fs/pass5.c Sat Aug 6 16:42:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pass5.c,v 1.18 2011/08/06 16:39:40 dholland Exp $ */
+/* $NetBSD: pass5.c,v 1.19 2011/08/06 16:42:41 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -58,7 +58,7 @@
#if 0
static char sccsid[] = "@(#)pass5.c 8.6 (Berkeley) 11/30/94";
#else
-__RCSID("$NetBSD: pass5.c,v 1.18 2011/08/06 16:39:40 dholland Exp $");
+__RCSID("$NetBSD: pass5.c,v 1.19 2011/08/06 16:42:41 dholland Exp $");
#endif
#endif /* not lint */
@@ -77,7 +77,7 @@
#include "extern.h"
-static void print_bmap(u_char *,u_int32_t);
+static void print_bmap(char *, uint32_t);
void
pass5(void)
@@ -263,7 +263,7 @@
}
static void
-print_bmap(u_char *map, u_int32_t size)
+print_bmap(char *map, uint32_t size)
{
uint32_t i, j;
@@ -271,7 +271,7 @@
while (i < size) {
printf("%04x: ",i);
for (j = 0; j < 16; j++, i++)
- printf("%02x ", (u_int)map[i] & 0xff);
+ printf("%02x ", (unsigned char)map[i] & 0xff);
printf("\n");
}
}
