From 52024061e4d4434cd47593bf6b1bf3c0411bd49f Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 23 Aug 2011 19:33:12 +0200 Subject: [PATCH] Make uv_getsockname() operate on uv_handle_t handles. --- include/uv.h | 2 +- src/uv-unix.c | 2 +- src/win/tcp.c | 2 +- test/test-getsockname.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/uv.h b/include/uv.h index 8338fdb7..2e6016b8 100644 --- a/include/uv.h +++ b/include/uv.h @@ -415,7 +415,7 @@ struct uv_connect_s { }; -int uv_getsockname(uv_tcp_t* handle, struct sockaddr* name, int* namelen); +int uv_getsockname(uv_handle_t* handle, struct sockaddr* name, int* namelen); /* diff --git a/src/uv-unix.c b/src/uv-unix.c index 767a6021..32a13e56 100644 --- a/src/uv-unix.c +++ b/src/uv-unix.c @@ -1116,7 +1116,7 @@ out: } -int uv_getsockname(uv_tcp_t* handle, struct sockaddr* name, int* namelen) { +int uv_getsockname(uv_handle_t* handle, struct sockaddr* name, int* namelen) { socklen_t socklen; int saved_errno; diff --git a/src/win/tcp.c b/src/win/tcp.c index cee49f6d..cdde45b3 100644 --- a/src/win/tcp.c +++ b/src/win/tcp.c @@ -548,7 +548,7 @@ int uv_tcp_connect6(uv_connect_t* req, uv_tcp_t* handle, } -int uv_getsockname(uv_tcp_t* handle, struct sockaddr* name, int* namelen) { +int uv_getsockname(uv_handle_t* handle, struct sockaddr* name, int* namelen) { int result; if (handle->flags & UV_HANDLE_SHUTTING) { diff --git a/test/test-getsockname.c b/test/test-getsockname.c index 8b783ec5..69dca502 100644 --- a/test/test-getsockname.c +++ b/test/test-getsockname.c @@ -89,7 +89,7 @@ static void on_connection(uv_stream_t* server, int status) { r = uv_accept(server, (uv_stream_t*)handle); ASSERT(r == 0); - status = uv_getsockname((uv_tcp_t*)handle, &sockname, &namelen); + status = uv_getsockname(handle, &sockname, &namelen); if (status != 0) { fprintf(stderr, "uv_getsockname error (accepted) %d\n", uv_last_error().code); } @@ -110,7 +110,7 @@ static void on_connect(uv_connect_t* req, int status) { ASSERT(status == 0); - r = uv_getsockname(&tcp, &sockname, &namelen); + r = uv_getsockname((uv_handle_t*)&tcp, &sockname, &namelen); if (r != 0) { fprintf(stderr, "uv_getsockname error (connector) %d\n", uv_last_error().code); } @@ -147,7 +147,7 @@ static int tcp_listener(int port) { return 1; } - r = uv_getsockname(&tcpServer, &sockname, &namelen); + r = uv_getsockname((uv_handle_t*)&tcpServer, &sockname, &namelen); if (r != 0) { fprintf(stderr, "uv_getsockname error (listening) %d\n", uv_last_error().code); }