diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2013-09-03 00:42:59 +0200 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2013-09-03 01:17:58 +0200 |
commit | ed8d97f572fab15025da0c762e5edfbcbe45f425 (patch) | |
tree | ca92b0ac08b5ebc14848883e4cba4e1edc9dd46b /deps/uv/test/test-shutdown-eof.c | |
parent | 185c515c9febf2229ed2ac76bfdd0c767ea7fd43 (diff) | |
download | android-node-v8-ed8d97f572fab15025da0c762e5edfbcbe45f425.tar.gz android-node-v8-ed8d97f572fab15025da0c762e5edfbcbe45f425.tar.bz2 android-node-v8-ed8d97f572fab15025da0c762e5edfbcbe45f425.zip |
uv: upgrade to v0.11.12
* upgrade deps/uv/ to v0.11.12.
* update files in src/ after a libuv API change.
Diffstat (limited to 'deps/uv/test/test-shutdown-eof.c')
-rw-r--r-- | deps/uv/test/test-shutdown-eof.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/deps/uv/test/test-shutdown-eof.c b/deps/uv/test/test-shutdown-eof.c index 9c848916b5..92e7312401 100644 --- a/deps/uv/test/test-shutdown-eof.c +++ b/deps/uv/test/test-shutdown-eof.c @@ -39,33 +39,31 @@ static int called_timer_close_cb; static int called_timer_cb; -static uv_buf_t alloc_cb(uv_handle_t* handle, size_t size) { - uv_buf_t buf; - buf.base = (char*)malloc(size); - buf.len = size; - return buf; +static void alloc_cb(uv_handle_t* handle, size_t size, uv_buf_t* buf) { + buf->base = malloc(size); + buf->len = size; } -static void read_cb(uv_stream_t* t, ssize_t nread, uv_buf_t buf) { +static void read_cb(uv_stream_t* t, ssize_t nread, const uv_buf_t* buf) { ASSERT((uv_tcp_t*)t == &tcp); if (nread == 0) { - free(buf.base); + free(buf->base); return; } if (!got_q) { ASSERT(nread == 1); ASSERT(!got_eof); - ASSERT(buf.base[0] == 'Q'); - free(buf.base); + ASSERT(buf->base[0] == 'Q'); + free(buf->base); got_q = 1; puts("got Q"); } else { ASSERT(nread == UV_EOF); - if (buf.base) { - free(buf.base); + if (buf->base) { + free(buf->base); } got_eof = 1; puts("got EOF"); @@ -158,11 +156,11 @@ TEST_IMPL(shutdown_eof) { uv_timer_start(&timer, timer_cb, 100, 0); - server_addr = uv_ip4_addr("127.0.0.1", TEST_PORT); + ASSERT(0 == uv_ip4_addr("127.0.0.1", TEST_PORT, &server_addr)); r = uv_tcp_init(uv_default_loop(), &tcp); ASSERT(!r); - r = uv_tcp_connect(&connect_req, &tcp, server_addr, connect_cb); + r = uv_tcp_connect(&connect_req, &tcp, &server_addr, connect_cb); ASSERT(!r); uv_run(uv_default_loop(), UV_RUN_DEFAULT); |