Module Name: src
Committed By: tron
Date: Mon Jul 18 17:15:07 UTC 2011
Modified Files:
src/usr.sbin/makefs/v7fs: Makefile.inc v7fs_populate.c
Log Message:
Fix broken error check found by GCC 4.5.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/makefs/v7fs/Makefile.inc \
src/usr.sbin/makefs/v7fs/v7fs_populate.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makefs/v7fs/Makefile.inc
diff -u src/usr.sbin/makefs/v7fs/Makefile.inc:1.1 src/usr.sbin/makefs/v7fs/Makefile.inc:1.2
--- src/usr.sbin/makefs/v7fs/Makefile.inc:1.1 Mon Jul 18 08:58:39 2011
+++ src/usr.sbin/makefs/v7fs/Makefile.inc Mon Jul 18 17:15:07 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/07/18 08:58:39 uch Exp $
+# $NetBSD: Makefile.inc,v 1.2 2011/07/18 17:15:07 tron Exp $
#
V7FS= ${NETBSDSRCDIR}/sys/fs/v7fs
@@ -7,7 +7,7 @@
.PATH: ${.CURDIR}/v7fs ${V7FS} ${NEWFS} ${FSCK}
-CPPFLAGS+= -DV7FS_EI -I${V7FS} -I${NEWFS} -I${FSCK}
+CPPFLAGS+= -DUSE_V7FS -DV7FS_EI -I${V7FS} -I${NEWFS} -I${FSCK}
SRCS += v7fs_endian.c v7fs_superblock.c v7fs_superblock_util.c v7fs_inode.c \
v7fs_inode_util.c v7fs_datablock.c v7fs_dirent.c v7fs_io.c v7fs_file.c \
Index: src/usr.sbin/makefs/v7fs/v7fs_populate.c
diff -u src/usr.sbin/makefs/v7fs/v7fs_populate.c:1.1 src/usr.sbin/makefs/v7fs/v7fs_populate.c:1.2
--- src/usr.sbin/makefs/v7fs/v7fs_populate.c:1.1 Mon Jul 18 08:58:39 2011
+++ src/usr.sbin/makefs/v7fs/v7fs_populate.c Mon Jul 18 17:15:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: v7fs_populate.c,v 1.1 2011/07/18 08:58:39 uch Exp $ */
+/* $NetBSD: v7fs_populate.c,v 1.2 2011/07/18 17:15:07 tron Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: v7fs_populate.c,v 1.1 2011/07/18 08:58:39 uch Exp $");
+__RCSID("$NetBSD: v7fs_populate.c,v 1.2 2011/07/18 17:15:07 tron Exp $");
#endif /* !__lint */
#include <stdio.h>
@@ -117,7 +117,7 @@
{
struct copy_arg *p = ctx;
- if ((sz = read(p->fd, p->buf, sz)) != sz) {
+ if (read(p->fd, p->buf, sz) != (ssize_t)sz) {
return V7FS_ITERATOR_ERROR;
}
