Make uv_getsockname() operate on uv_handle_t handles.

joyent · Aug 24, 2011 · 5202406 · 5202406
1 parent 5cae6e4
commit 5202406
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -1116,7 +1116,7 @@ int uv_tcp_connect6(uv_connect_t* req,
 }
 
 
-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
@@ -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
@@ -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);
   }