mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #17497 : nodakai/rust/libnative-misc-fixes, r=alexcrichton

Browse Source 
libnative/io: datasync() wrongly called fsync().
liblibc and libnative: send() should use const buffers.
This commit is contained in:
bors 2014-09-25 12:02:52 +00:00
commit 375fe17218
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/liblibc/lib.rs
View File

@ -4633,7 +4633,7 @@ pub fn setsockopt(socket: c_int, level: c_int, name: c_int,
option_len: socklen_t) -> c_int;
pub fn recv(socket: c_int, buf: *mut c_void, len: size_t,
flags: c_int) -> ssize_t;
pub fn send(socket: c_int, buf: *mut c_void, len: size_t,
pub fn send(socket: c_int, buf: *const c_void, len: size_t,
flags: c_int) -> ssize_t;
pub fn recvfrom(socket: c_int, buf: *mut c_void, len: size_t,
flags: c_int, addr: *mut sockaddr,
@ -4673,7 +4673,7 @@ pub fn setsockopt(socket: SOCKET, level: c_int, name: c_int,
pub fn closesocket(socket: SOCKET) -> c_int;
pub fn recv(socket: SOCKET, buf: *mut c_void, len: c_int,
flags: c_int) -> c_int;
pub fn send(socket: SOCKET, buf: *mut c_void, len: c_int,
pub fn send(socket: SOCKET, buf: *const c_void, len: c_int,
flags: c_int) -> c_int;
pub fn recvfrom(socket: SOCKET, buf: *mut c_void, len: c_int,
flags: c_int, addr: *mut sockaddr,

2
src/libnative/io/file_unix.rs
View File

@ -303,7 +303,7 @@ fn fsync(&mut self) -> IoResult<()> {
self.flush().and_then(|()| self.fd.fsync())
}
fn datasync(&mut self) -> IoResult<()> {
self.flush().and_then(|()| self.fd.fsync())
self.flush().and_then(|()| self.fd.datasync())
}
fn truncate(&mut self, offset: i64) -> IoResult<()> {
self.flush().and_then(|()| self.fd.truncate(offset))

2
src/libnative/io/net.rs
View File

@ -337,7 +337,7 @@ fn write(&mut self, buf: &[u8]) -> IoResult<()> {
let dowrite = |nb: bool, buf: *const u8, len: uint| unsafe {
let flags = if nb {c::MSG_DONTWAIT} else {0};
libc::send(fd,
buf as *mut libc::c_void,
buf as *const _,
len as wrlen,
flags) as i64
};

2
src/libnative/io/pipe_unix.rs
View File

@ -173,7 +173,7 @@ fn write(&mut self, buf: &[u8]) -> IoResult<()> {
let dowrite = |nb: bool, buf: *const u8, len: uint| unsafe {
let flags = if nb {c::MSG_DONTWAIT} else {0};
libc::send(fd,
buf as *mut libc::c_void,
buf as *const _,
len as libc::size_t,
flags) as i64
};