diff options
author | Rick Richardson <rick.richardson@gmail.com> | 2015-01-10 14:20:21 -0500 |
---|---|---|
committer | Carl Lerche <me@carllerche.com> | 2015-01-13 11:31:41 -0800 |
commit | 380d4020f10583797fe7bab6fe95923934660605 (patch) | |
tree | 3d0b302f900acd1bf1e5e5a6303c21311d24f2fe /src/unistd.rs | |
parent | f70a60e0b4dd670171a12fa98101ffc52f528eec (diff) | |
download | nix-380d4020f10583797fe7bab6fe95923934660605.zip |
changed uint and int to usize and isize respectively
Diffstat (limited to 'src/unistd.rs')
-rw-r--r-- | src/unistd.rs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/unistd.rs b/src/unistd.rs index 1acbda3d..952040fd 100644 --- a/src/unistd.rs +++ b/src/unistd.rs @@ -97,7 +97,7 @@ pub fn fork() -> SysResult<Fork> { // let mut v = Vec::new(); // let iov = Iovec::from_slice(immutable_vec.as_slice()); // v.push(iov); -// let _:SysResult<uint> = readv(fd, v.as_slice()); +// let _:SysResult<usize> = readv(fd, v.as_slice()); // We do not want <T> to appear in ffi functions, so we provide this aliases. type IovecR = Iovec<ToRead>; @@ -117,7 +117,7 @@ pub struct Iovec<T> { impl <T> Iovec<T> { #[inline] pub fn as_slice<'a>(&'a self) -> &'a [u8] { - unsafe { mem::transmute(RawSlice { data: self.iov_base as *const u8, len: self.iov_len as uint }) } + unsafe { mem::transmute(RawSlice { data: self.iov_base as *const u8, len: self.iov_len as usize }) } } } @@ -271,42 +271,42 @@ pub fn close(fd: Fd) -> SysResult<()> { from_ffi(res) } -pub fn read(fd: Fd, buf: &mut [u8]) -> SysResult<uint> { +pub fn read(fd: Fd, buf: &mut [u8]) -> SysResult<usize> { let res = unsafe { ffi::read(fd, buf.as_mut_ptr() as *mut c_void, buf.len() as size_t) }; if res < 0 { return Err(SysError::last()); } - return Ok(res as uint) + return Ok(res as usize) } -pub fn write(fd: Fd, buf: &[u8]) -> SysResult<uint> { +pub fn write(fd: Fd, buf: &[u8]) -> SysResult<usize> { let res = unsafe { ffi::write(fd, buf.as_ptr() as *const c_void, buf.len() as size_t) }; if res < 0 { return Err(SysError::last()); } - return Ok(res as uint) + return Ok(res as usize) } -pub fn writev(fd: Fd, iov: &[Iovec<ToWrite>]) -> SysResult<uint> { +pub fn writev(fd: Fd, iov: &[Iovec<ToWrite>]) -> SysResult<usize> { let res = unsafe { ffi::writev(fd, iov.as_ptr(), iov.len() as c_int) }; if res < 0 { return Err(SysError::last()); } - return Ok(res as uint) + return Ok(res as usize) } -pub fn readv(fd: Fd, iov: &mut [Iovec<ToRead>]) -> SysResult<uint> { +pub fn readv(fd: Fd, iov: &mut [Iovec<ToRead>]) -> SysResult<usize> { let res = unsafe { ffi::readv(fd, iov.as_ptr(), iov.len() as c_int) }; if res < 0 { return Err(SysError::last()); } - return Ok(res as uint) + return Ok(res as usize) } pub fn pipe() -> SysResult<(Fd, Fd)> { |