Module Name: src
Committed By: phx
Date: Sun Aug 30 12:36:38 UTC 2009
Modified Files:
src/sys/fs/adosfs: adosfs.h advfsops.c advnops.c
Log Message:
Fixed fatal warnings with ADOSFS_DIAGNOSTIC.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/fs/adosfs/adosfs.h
cvs rdiff -u -r1.58 -r1.59 src/sys/fs/adosfs/advfsops.c
cvs rdiff -u -r1.35 -r1.36 src/sys/fs/adosfs/advnops.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/adosfs/adosfs.h
diff -u src/sys/fs/adosfs/adosfs.h:1.10 src/sys/fs/adosfs/adosfs.h:1.11
--- src/sys/fs/adosfs/adosfs.h:1.10 Sat Mar 14 14:46:09 2009
+++ src/sys/fs/adosfs/adosfs.h Sun Aug 30 12:36:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: adosfs.h,v 1.10 2009/03/14 14:46:09 dsl Exp $ */
+/* $NetBSD: adosfs.h,v 1.11 2009/08/30 12:36:38 phx Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -178,5 +178,8 @@
extern int (**adosfs_vnodeop_p)(void *);
+/* Should print a vnode or the vnode-op's arguments? */
+#define advopprint(p) /* XXX */
+
#endif /* _KERNEL */
#endif /* _ADOSFS_ADOSFS_H_ */
Index: src/sys/fs/adosfs/advfsops.c
diff -u src/sys/fs/adosfs/advfsops.c:1.58 src/sys/fs/adosfs/advfsops.c:1.59
--- src/sys/fs/adosfs/advfsops.c:1.58 Mon Jun 29 05:08:17 2009
+++ src/sys/fs/adosfs/advfsops.c Sun Aug 30 12:36:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: advfsops.c,v 1.58 2009/06/29 05:08:17 dholland Exp $ */
+/* $NetBSD: advfsops.c,v 1.59 2009/08/30 12:36:38 phx Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advfsops.c,v 1.58 2009/06/29 05:08:17 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advfsops.c,v 1.59 2009/08/30 12:36:38 phx Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -673,7 +673,7 @@
return EINVAL;
#ifdef ADOSFS_DIAGNOSTIC
- printf("adfhtovp(%x, %x, %x)\n", mp, fhp, vpp);
+ printf("adfhtovp(%p, %p, %p)\n", mp, fhp, vpp);
#endif
memcpy(&ifh, fhp, sizeof(ifh));
@@ -713,7 +713,7 @@
memcpy(fhp, &ifh, sizeof(ifh));
#ifdef ADOSFS_DIAGNOSTIC
- printf("advptofh(%x, %x)\n", vp, fhp);
+ printf("advptofh(%p, %p)\n", vp, fhp);
#endif
return(0);
}
@@ -722,7 +722,7 @@
adosfs_sync(struct mount *mp, int waitfor, kauth_cred_t uc)
{
#ifdef ADOSFS_DIAGNOSTIC
- printf("ad_sync(%x, %x)\n", mp, waitfor);
+ printf("ad_sync(%p, %d)\n", mp, waitfor);
#endif
return(0);
}
Index: src/sys/fs/adosfs/advnops.c
diff -u src/sys/fs/adosfs/advnops.c:1.35 src/sys/fs/adosfs/advnops.c:1.36
--- src/sys/fs/adosfs/advnops.c:1.35 Fri Jul 3 21:17:40 2009
+++ src/sys/fs/adosfs/advnops.c Sun Aug 30 12:36:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: advnops.c,v 1.35 2009/07/03 21:17:40 elad Exp $ */
+/* $NetBSD: advnops.c,v 1.36 2009/08/30 12:36:38 phx Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.35 2009/07/03 21:17:40 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.36 2009/08/30 12:36:38 phx Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -342,6 +342,7 @@
adosfs_write(void *v)
{
#ifdef ADOSFS_DIAGNOSTIC
+#if 0
struct vop_write_args /* {
struct vnode *a_vp;
struct uio *a_uio;
@@ -349,6 +350,7 @@
kauth_cred_t a_cred;
} */ *sp = v;
advopprint(sp);
+#endif
printf(" EOPNOTSUPP)");
#endif
return(EOPNOTSUPP);
