Mon Jun 22 21:13:50 2009 UTC ()
Fix compilation with SMB_*_DEBUG options.


(njoly)
diff -r1.32 -r1.33 src/sys/fs/smbfs/smbfs_io.c
diff -r1.67 -r1.68 src/sys/fs/smbfs/smbfs_vnops.c

cvs diff -r1.32 -r1.33 src/sys/fs/smbfs/Attic/smbfs_io.c (expand / switch to context diff)
--- src/sys/fs/smbfs/Attic/smbfs_io.c 2009/03/18 16:00:21 1.32
+++ src/sys/fs/smbfs/Attic/smbfs_io.c 2009/06/22 21:13:50 1.33
@@ -1,4 +1,4 @@
-/*	$NetBSD: smbfs_io.c,v 1.32 2009/03/18 16:00:21 cegger Exp $	*/
+/*	$NetBSD: smbfs_io.c,v 1.33 2009/06/22 21:13:50 njoly Exp $	*/
 
 /*
  * Copyright (c) 2000-2001, Boris Popov
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbfs_io.c,v 1.32 2009/03/18 16:00:21 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_io.c,v 1.33 2009/06/22 21:13:50 njoly Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -254,7 +254,7 @@
 	/* vn types other than VREG unsupported */
 	KASSERT(vp->v_type == VREG);
 
-	SMBVDEBUG("ofs=%lld,resid=%d\n",
+	SMBVDEBUG("ofs=%lld,resid=%zu\n",
 		(long long int) uiop->uio_offset,
 		uiop->uio_resid);
 	if (uiop->uio_offset < 0)
@@ -291,7 +291,8 @@
 	}
 	smb_makescred(&scred, l, cred);
 	error = smb_write(smp->sm_share, np->n_fid, uiop, &scred);
-	SMBVDEBUG("after: ofs=%lld,resid=%d,err=%d\n",(long long int)uiop->uio_offset, uiop->uio_resid, error);
+	SMBVDEBUG("after: ofs=%lld,resid=%zu,err=%d\n",
+	    (long long int)uiop->uio_offset, uiop->uio_resid, error);
 	if (!error) {
 		if (uiop->uio_offset > np->n_size) {
 			np->n_size = uiop->uio_offset;

cvs diff -r1.67 -r1.68 src/sys/fs/smbfs/Attic/smbfs_vnops.c (expand / switch to context diff)
--- src/sys/fs/smbfs/Attic/smbfs_vnops.c 2009/05/07 19:30:30 1.67
+++ src/sys/fs/smbfs/Attic/smbfs_vnops.c 2009/06/22 21:13:50 1.68
@@ -1,4 +1,4 @@
-/*	$NetBSD: smbfs_vnops.c,v 1.67 2009/05/07 19:30:30 elad Exp $	*/
+/*	$NetBSD: smbfs_vnops.c,v 1.68 2009/06/22 21:13:50 njoly Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbfs_vnops.c,v 1.67 2009/05/07 19:30:30 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_vnops.c,v 1.68 2009/06/22 21:13:50 njoly Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -525,7 +525,8 @@
 	struct vnode *vp = ap->a_vp;
 	struct uio *uio = ap->a_uio;
 
-	SMBVDEBUG("%d,ofs=%lld,sz=%u\n",vp->v_type, (long long int)uio->uio_offset, uio->uio_resid);
+	SMBVDEBUG("%d,ofs=%lld,sz=%zu\n",vp->v_type,
+	    (long long int)uio->uio_offset, uio->uio_resid);
 	if (vp->v_type != VREG)
 		return (EPERM);
 	return smbfs_writevnode(vp, uio, ap->a_cred, ap->a_ioflag);