aboutsummaryrefslogtreecommitdiff
path: root/deps/uv/test/echo-server.c
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2011-08-22 14:51:29 -0700
committerRyan Dahl <ry@tinyclouds.org>2011-08-22 14:52:28 -0700
commitb8d40be6112a20d7508704241d944fc3d5b6dfc3 (patch)
treeea092df70ef8ac7db84474613499e4975d21e202 /deps/uv/test/echo-server.c
parent103990b64043b980cf98feefcae12019ae6e3108 (diff)
downloadandroid-node-v8-b8d40be6112a20d7508704241d944fc3d5b6dfc3.tar.gz
android-node-v8-b8d40be6112a20d7508704241d944fc3d5b6dfc3.tar.bz2
android-node-v8-b8d40be6112a20d7508704241d944fc3d5b6dfc3.zip
Upgrade libuv to joyent/libuv@ce20791
Diffstat (limited to 'deps/uv/test/echo-server.c')
-rw-r--r--deps/uv/test/echo-server.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/deps/uv/test/echo-server.c b/deps/uv/test/echo-server.c
index f75d38858a..82be72a513 100644
--- a/deps/uv/test/echo-server.c
+++ b/deps/uv/test/echo-server.c
@@ -111,8 +111,7 @@ static void after_read(uv_stream_t* handle, ssize_t nread, uv_buf_t buf) {
wr = (write_req_t*) malloc(sizeof *wr);
- wr->buf.base = buf.base;
- wr->buf.len = nread;
+ wr->buf = uv_buf_init(buf.base, nread);
if (uv_write(&wr->req, handle, &wr->buf, 1, after_write)) {
FATAL("uv_write failed");
}
@@ -125,10 +124,7 @@ static void on_close(uv_handle_t* peer) {
static uv_buf_t echo_alloc(uv_stream_t* handle, size_t suggested_size) {
- uv_buf_t buf;
- buf.base = (char*) malloc(suggested_size);
- buf.len = suggested_size;
- return buf;
+ return uv_buf_init(malloc(suggested_size), suggested_size);
}
@@ -199,7 +195,7 @@ static int tcp4_echo_start(int port) {
r = uv_listen((uv_stream_t*)&tcpServer, SOMAXCONN, on_connection);
if (r) {
/* TODO: Error codes */
- fprintf(stderr, "Listen error\n");
+ fprintf(stderr, "Listen error %s\n", uv_err_name(uv_last_error()));
return 1;
}