- 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.
This commit is contained in:
parent
2274e4f83a
commit
985cce5132
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=106667
@ -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;
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user