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

std: tweak uv::ll::write signature and make it generic/more flexible

Browse Source
This commit is contained in:
Jeff Olson 2012-05-01 16:40:38 -07:00 committed by Brian Anderson
parent 550b34b782
commit 5590dfc857
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libstd/uv_ll.rs
View File

@ -647,11 +647,13 @@ unsafe fn accept(server: *libc::c_void, client: *libc::c_void)
ret rustrt::rust_uv_accept(server, client); ret rustrt::rust_uv_accept(server, client);
} }
unsafe fn write(req: *libc::c_void, stream: *libc::c_void, unsafe fn write<T>(req: *uv_write_t, stream: *T,
buf_in: *[uv_buf_t], cb: *u8) -> libc::c_int { buf_in: *[uv_buf_t], cb: *u8) -> libc::c_int {
let buf_ptr = vec::unsafe::to_ptr(*buf_in); let buf_ptr = vec::unsafe::to_ptr(*buf_in);
let buf_cnt = vec::len(*buf_in) as i32; let buf_cnt = vec::len(*buf_in) as i32;
ret rustrt::rust_uv_write(req, stream, buf_ptr, buf_cnt, cb); ret rustrt::rust_uv_write(req as *libc::c_void,
stream as *libc::c_void,
buf_ptr, buf_cnt, cb);
} }
unsafe fn read_start(stream: *uv_stream_t, on_alloc: *u8, unsafe fn read_start(stream: *uv_stream_t, on_alloc: *u8,
on_read: *u8) -> libc::c_int { on_read: *u8) -> libc::c_int {
@ -907,7 +909,7 @@ enum tcp_read_data {
let client_data = get_data_for_req( let client_data = get_data_for_req(
connect_req_ptr as *libc::c_void) connect_req_ptr as *libc::c_void)
as *request_wrapper; as *request_wrapper;
let write_handle = (*client_data).write_req as *libc::c_void; let write_handle = (*client_data).write_req;
log(debug, #fmt("on_connect_cb: tcp: %d write_hdl: %d", log(debug, #fmt("on_connect_cb: tcp: %d write_hdl: %d",
stream as int, write_handle as int)); stream as int, write_handle as int));
let write_result = write(write_handle, let write_result = write(write_handle,
@ -1053,7 +1055,7 @@ fn impl_uv_tcp_request(ip: str, port: int, req_str: str,
let server_chan = *((*client_data).server_chan); let server_chan = *((*client_data).server_chan);
comm::send(server_chan, request_str); comm::send(server_chan, request_str);
let write_result = write( let write_result = write(
write_req as *libc::c_void, write_req,
client_stream_ptr as *libc::c_void, client_stream_ptr as *libc::c_void,
(*client_data).server_resp_buf, (*client_data).server_resp_buf,
after_server_resp_write); after_server_resp_write);