diff options
| author | Brad King <brad.king@kitware.com> | 2018-05-08 12:34:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-05-08 12:34:51 (GMT) |
| commit | 65431c727b53ff092ad6f2f8c081982bdde52385 (patch) | |
| tree | c2d84c39997e27f28b54d6722ea52721895a8352 /Utilities/cmlibuv/src/unix/getaddrinfo.c | |
| parent | d165fd1727c1fdf540f1759583b84110bdc4a2a3 (diff) | |
| parent | 0d389d175a1c40ac0ae822e1cc638cf15f05a0ce (diff) | |
| download | CMake-65431c727b53ff092ad6f2f8c081982bdde52385.zip CMake-65431c727b53ff092ad6f2f8c081982bdde52385.tar.gz CMake-65431c727b53ff092ad6f2f8c081982bdde52385.tar.bz2 | |
Merge topic 'update-libuv'
0d389d175a libuv: Revert local linux/sparc64 fix now that we have upstream fix
42fbb28516 Merge branch 'upstream-libuv' into update-libuv
c8b67ea119 libuv 2018-05-06 (bf605bd7)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2049
Diffstat (limited to 'Utilities/cmlibuv/src/unix/getaddrinfo.c')
| -rw-r--r-- | Utilities/cmlibuv/src/unix/getaddrinfo.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Utilities/cmlibuv/src/unix/getaddrinfo.c b/Utilities/cmlibuv/src/unix/getaddrinfo.c index 0185971..10e8afd 100644 --- a/Utilities/cmlibuv/src/unix/getaddrinfo.c +++ b/Utilities/cmlibuv/src/unix/getaddrinfo.c @@ -86,7 +86,7 @@ int uv__getaddrinfo_translate_error(int sys_err) { case EAI_SOCKTYPE: return UV_EAI_SOCKTYPE; #endif #if defined(EAI_SYSTEM) - case EAI_SYSTEM: return -errno; + case EAI_SYSTEM: return UV__ERR(errno); #endif } assert(!"unknown EAI_* error code"); @@ -125,7 +125,7 @@ static void uv__getaddrinfo_done(struct uv__work* w, int status) { req->service = NULL; req->hostname = NULL; - if (status == -ECANCELED) { + if (status == UV_ECANCELED) { assert(req->retcode == 0); req->retcode = UV_EAI_CANCELED; } @@ -148,7 +148,7 @@ int uv_getaddrinfo(uv_loop_t* loop, char* buf; if (req == NULL || (hostname == NULL && service == NULL)) - return -EINVAL; + return UV_EINVAL; hostname_len = hostname ? strlen(hostname) + 1 : 0; service_len = service ? strlen(service) + 1 : 0; @@ -156,7 +156,7 @@ int uv_getaddrinfo(uv_loop_t* loop, buf = uv__malloc(hostname_len + service_len + hints_len); if (buf == NULL) - return -ENOMEM; + return UV_ENOMEM; uv__req_init(loop, req, UV_GETADDRINFO); req->loop = loop; @@ -211,7 +211,7 @@ int uv_if_indextoname(unsigned int ifindex, char* buffer, size_t* size) { return UV_EINVAL; if (if_indextoname(ifindex, ifname_buf) == NULL) - return -errno; + return UV__ERR(errno); len = strnlen(ifname_buf, sizeof(ifname_buf)); |