Module Name: src
Committed By: agc
Date: Mon Jun 11 21:11:41 UTC 2012
Modified Files:
src/sys/fs/sysvbfs: bfs.c sysvbfs_vnops.c
Log Message:
cosmetic change: fix two casts to be of the appropriate type
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/fs/sysvbfs/bfs.c
cvs rdiff -u -r1.45 -r1.46 src/sys/fs/sysvbfs/sysvbfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/sysvbfs/bfs.c
diff -u src/sys/fs/sysvbfs/bfs.c:1.15 src/sys/fs/sysvbfs/bfs.c:1.16
--- src/sys/fs/sysvbfs/bfs.c:1.15 Tue May 8 14:28:55 2012
+++ src/sys/fs/sysvbfs/bfs.c Mon Jun 11 21:11:40 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bfs.c,v 1.15 2012/05/08 14:28:55 tsutsui Exp $ */
+/* $NetBSD: bfs.c,v 1.16 2012/06/11 21:11:40 agc Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bfs.c,v 1.15 2012/05/08 14:28:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bfs.c,v 1.16 2012/06/11 21:11:40 agc Exp $");
#define BFS_DEBUG
#include <sys/param.h>
@@ -629,7 +629,7 @@ bfs_inode_set_attr(const struct bfs *bfs
if (from != NULL) {
if (from->uid != (uid_t)-1)
to->uid = from->uid;
- if (from->gid != (uid_t)-1)
+ if (from->gid != (gid_t)-1)
to->gid = from->gid;
if (from->mode != (mode_t)-1)
to->mode = from->mode;
Index: src/sys/fs/sysvbfs/sysvbfs_vnops.c
diff -u src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.45 src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.46
--- src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.45 Tue May 8 14:28:55 2012
+++ src/sys/fs/sysvbfs/sysvbfs_vnops.c Mon Jun 11 21:11:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sysvbfs_vnops.c,v 1.45 2012/05/08 14:28:55 tsutsui Exp $ */
+/* $NetBSD: sysvbfs_vnops.c,v 1.46 2012/06/11 21:11:41 agc Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.45 2012/05/08 14:28:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.46 2012/06/11 21:11:41 agc Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -350,7 +350,7 @@ sysvbfs_setattr(void *arg)
if (vap->va_flags != VNOVAL)
return EOPNOTSUPP;
- if (vap->va_uid != (uid_t)VNOVAL || vap->va_gid != (uid_t)VNOVAL) {
+ if (vap->va_uid != (uid_t)VNOVAL || vap->va_gid != (gid_t)VNOVAL) {
uid_t uid =
(vap->va_uid != (uid_t)VNOVAL) ? vap->va_uid : attr->uid;
gid_t gid =
