d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
John Baldwin 2002-11-08 21:26:32 +00:00
parent 2274e4f83a
commit 985cce5132
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/netncp/ncp_rq.c
View File

@ -149,7 +149,7 @@ ncp_rq_done(struct ncp_rq *rqp)
*/ */
static int 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); ncp_pathcopy(src, dst, len, mbp->mb_udata);
return 0; return 0;

4
sys/netsmb/smb_subr.c
View File

@ -307,9 +307,9 @@ smb_maperror(int eclass, int eno)
} }
static int 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); return iconv_conv((struct iconv_drv*)mbp->mb_udata, &src, &len, &dst, &outlen);
} }

2
sys/sys/mchain.h
View File

@ -117,7 +117,7 @@ betohq(int64_t x)
struct mbuf; struct mbuf;
struct mbchain; 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 mbchain {
struct mbuf * mb_top; /* head of mbufs chain */ struct mbuf * mb_top; /* head of mbufs chain */