[src/trunk]: src/sys/fs/adosfs Fixed fatal warnings with ADOSFS_DIAGNOSTIC.

[phx <phx%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b017dda6941d
branches:  trunk
changeset: 747048:b017dda6941d
user:      phx <phx%NetBSD.org@localhost>
date:      Sun Aug 30 12:36:38 2009 +0000

description:
Fixed fatal warnings with ADOSFS_DIAGNOSTIC.

diffstat:

 sys/fs/adosfs/adosfs.h   |   5 ++++-
 sys/fs/adosfs/advfsops.c |  10 +++++-----
 sys/fs/adosfs/advnops.c  |   6 ++++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diffs (97 lines):

diff -r e2243367596e -r b017dda6941d sys/fs/adosfs/adosfs.h
--- a/sys/fs/adosfs/adosfs.h    Sun Aug 30 02:07:05 2009 +0000
+++ b/sys/fs/adosfs/adosfs.h    Sun Aug 30 12:36:38 2009 +0000
@@ -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_ */
diff -r e2243367596e -r b017dda6941d sys/fs/adosfs/advfsops.c
--- a/sys/fs/adosfs/advfsops.c  Sun Aug 30 02:07:05 2009 +0000
+++ b/sys/fs/adosfs/advfsops.c  Sun Aug 30 12:36:38 2009 +0000
@@ -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);
 }
diff -r e2243367596e -r b017dda6941d sys/fs/adosfs/advnops.c
--- a/sys/fs/adosfs/advnops.c   Sun Aug 30 02:07:05 2009 +0000
+++ b/sys/fs/adosfs/advnops.c   Sun Aug 30 12:36:38 2009 +0000
@@ -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);