From 3a8bb3b2b1aae1d254eee0da62f55a2a8e921011 Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Mon, 6 Aug 2012 23:55:19 +0200 Subject: [PATCH] Use uv_inet_ntop/uv_inet_pton, instead of the c-ares implementations --- src/uv-common.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/uv-common.c b/src/uv-common.c index 9639634a..75dfcd89 100644 --- a/src/uv-common.c +++ b/src/uv-common.c @@ -28,10 +28,6 @@ #include /* malloc */ #include /* memset */ -/* use inet_pton from c-ares if necessary */ -#include "ares_config.h" -#include "ares/inet_net_pton.h" -#include "ares/inet_ntop.h" #define XX(uc, lc) case UV_##uc: return sizeof(uv_##lc##_t); @@ -182,21 +178,21 @@ struct sockaddr_in6 uv_ip6_addr(const char* ip, int port) { addr.sin6_family = AF_INET6; addr.sin6_port = htons(port); - ares_inet_pton(AF_INET6, ip, &addr.sin6_addr); + uv_inet_pton(AF_INET6, ip, &addr.sin6_addr); return addr; } int uv_ip4_name(struct sockaddr_in* src, char* dst, size_t size) { - const char* d = ares_inet_ntop(AF_INET, &src->sin_addr, dst, size); - return d != dst; + uv_err_t err = uv_inet_ntop(AF_INET, &src->sin_addr, dst, size); + return err.code != UV_OK; } int uv_ip6_name(struct sockaddr_in6* src, char* dst, size_t size) { - const char* d = ares_inet_ntop(AF_INET6, &src->sin6_addr, dst, size); - return d != dst; + uv_err_t err = uv_inet_ntop(AF_INET6, &src->sin6_addr, dst, size); + return err.code != UV_OK; }