- Change mb_copy_t to take a size_t as the length argument instead of an

  int.
- Change the local variable in smb_copy_iconv() from an int to a size_t.

These make smb_copy_iconv() happy in a 64-bit world.

3 files changed, 4 insertions, 4 deletions

diff --git a/sys/netncp/ncp_rq.c b/sys/netncp/ncp_rq.c
index a415adc..ea70731 100644
--- a/sys/netncp/ncp_rq.c
+++ b/sys/netncp/ncp_rq.c
@@ -149,7 +149,7 @@ ncp_rq_done(struct ncp_rq *rqp)
  */
 
 static int
-ncp_rq_pathstrhelp(struct mbchain *mbp, c_caddr_t src, caddr_t dst, int len)
+ncp_rq_pathstrhelp(struct mbchain *mbp, c_caddr_t src, caddr_t dst, size_t len)
 {
 	ncp_pathcopy(src, dst, len, mbp->mb_udata);
 	return 0;
diff --git a/sys/netsmb/smb_subr.c b/sys/netsmb/smb_subr.c
index 4a37d6e..f58d235 100644
--- a/sys/netsmb/smb_subr.c
+++ b/sys/netsmb/smb_subr.c
@@ -307,9 +307,9 @@ smb_maperror(int eclass, int eno)
 }
 
 static int
-smb_copy_iconv(struct mbchain *mbp, c_caddr_t src, caddr_t dst, int len)
+smb_copy_iconv(struct mbchain *mbp, c_caddr_t src, caddr_t dst, size_t len)
 {
-	int outlen = len;
+	size_t outlen = len;
 
 	return iconv_conv((struct iconv_drv*)mbp->mb_udata, &src, &len, &dst, &outlen);
 }
diff --git a/sys/sys/mchain.h b/sys/sys/mchain.h
index 61f0af9..ce38465 100644
--- a/sys/sys/mchain.h
+++ b/sys/sys/mchain.h
@@ -117,7 +117,7 @@ betohq(int64_t x)
 struct mbuf;
 struct mbchain;
 
-typedef int mb_copy_t(struct mbchain *mbp, c_caddr_t src, caddr_t dst, int len);
+typedef int mb_copy_t(struct mbchain *mbp, c_caddr_t src, caddr_t dst, size_t len);
 
 struct mbchain {
 	struct mbuf *	mb_top;		/* head of mbufs chain */