From cfcd3e683bd5ce1259231be7f43085832cd9e3b9 Mon Sep 17 00:00:00 2001 From: Jeff Olson Date: Wed, 27 Jun 2012 15:28:03 -0700 Subject: std/rt: cleanup and adding sockaddr_in6 mapping for win32 --- src/rt/rust_uv.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/rt/rust_uv.cpp') diff --git a/src/rt/rust_uv.cpp b/src/rt/rust_uv.cpp index e47af4e10a3..9124172af1a 100644 --- a/src/rt/rust_uv.cpp +++ b/src/rt/rust_uv.cpp @@ -459,7 +459,7 @@ extern "C" struct sockaddr_in rust_uv_ip4_addr(const char* ip, int port) { rust_task* task = rust_get_current_task(); LOG(task, stdlib, "before creating addr_ptr.. ip %s" \ - "port %d", ip, port); + " port %d\n", ip, port); struct sockaddr_in addr = uv_ip4_addr(ip, port); LOG(task, stdlib, "after creating .. port: %d", addr.sin_port); return addr; @@ -468,9 +468,8 @@ extern "C" struct sockaddr_in6 rust_uv_ip6_addr(const char* ip, int port) { rust_task* task = rust_get_current_task(); LOG(task, stdlib, "before creating addr_ptr.. ip %s" \ - "port %d", ip, port); - struct sockaddr_in6 addr = uv_ip6_addr(ip, port); - return addr; + " port %d\n", ip, port); + return uv_ip6_addr(ip, port); } extern "C" int rust_uv_ip4_name(struct sockaddr_in* src, char* dst, size_t size) { @@ -478,7 +477,10 @@ rust_uv_ip4_name(struct sockaddr_in* src, char* dst, size_t size) { } extern "C" int rust_uv_ip6_name(struct sockaddr_in6* src, char* dst, size_t size) { - return uv_ip6_name(src, dst, size); + int result = uv_ip6_name(src, dst, size); + printf("rust_uv_ip6_name: src ptr: %lu dst result: '%s'\n", + (unsigned long int)src, dst); + return result; } extern "C" uintptr_t* -- cgit 1.4.1-3-g733a5