diff options
| author | peter <peter@FreeBSD.org> | 2003-07-24 01:59:18 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2003-07-24 01:59:18 +0000 |
| commit | 44b5ea3111c5c9286ae04a396c766901e8e5b55c (patch) | |
| tree | 807dfc524631c0ba48c0e801bb54602242f1827f | |
| parent | a60ef94facf7f32b340fddd9ffef174eddc4d826 (diff) | |
| download | FreeBSD-src-44b5ea3111c5c9286ae04a396c766901e8e5b55c.zip FreeBSD-src-44b5ea3111c5c9286ae04a396c766901e8e5b55c.tar.gz | |
size_t != int. Make this compile on 64 bit platforms (eg: amd64).
Also, "u_short value; if (value > 0xffff)" can never be true.
| -rw-r--r-- | sys/fs/smbfs/smbfs_vfsops.c | 3 | ||||
| -rw-r--r-- | sys/netncp/ncp_ncp.c | 3 | ||||
| -rw-r--r-- | sys/netsmb/smb_usr.c | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sys/fs/smbfs/smbfs_vfsops.c b/sys/fs/smbfs/smbfs_vfsops.c index 2d8b3ac..5bc646a 100644 --- a/sys/fs/smbfs/smbfs_vfsops.c +++ b/sys/fs/smbfs/smbfs_vfsops.c @@ -332,7 +332,8 @@ smbfs_init(struct vfsconf *vfsp) { #ifndef SMP int name[2]; - int olen, ncpu, plen, error; + int ncpu, error; + size_t olen, plen; name[0] = CTL_HW; name[1] = HW_NCPU; diff --git a/sys/netncp/ncp_ncp.c b/sys/netncp/ncp_ncp.c index e7b5e16..bf51b43 100644 --- a/sys/netncp/ncp_ncp.c +++ b/sys/netncp/ncp_ncp.c @@ -206,7 +206,8 @@ int ncp_renegotiate_connparam(struct ncp_conn *conn, int buffsize, u_int8_t in_options) { u_int8_t options; - int neg_buffsize, error, sl, ckslevel, ilen; + int neg_buffsize, error, sl, ckslevel; + size_t ilen; sl = conn->li.sig_level; if (sl >= 2) diff --git a/sys/netsmb/smb_usr.c b/sys/netsmb/smb_usr.c index 9e42fd4..fd0a326 100644 --- a/sys/netsmb/smb_usr.c +++ b/sys/netsmb/smb_usr.c @@ -302,8 +302,7 @@ smb_usr_t2request(struct smb_share *ssp, struct smbioc_t2rq *dp, struct mdchain *mdp; int error, len; - if (dp->ioc_tparamcnt > 0xffff || dp->ioc_tdatacnt > 0xffff || - dp->ioc_setupcnt > 3) + if (dp->ioc_setupcnt > 3) return EINVAL; error = smb_t2_init(t2p, SSTOCP(ssp), dp->ioc_setup[0], scred); if (error) |
