diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-08-27 23:39:15 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-08-27 23:39:15 +0900 |
| commit | 96d701f73780638ffd3c8fa91c43f33f1a207d65 (patch) | |
| tree | fc56b39902c7037291b3d803217e0883115f8518 /ext | |
| parent | b8bfb1d5f5b15aa0bfa54ac3f97af1034f16359b (diff) | |
Adjust indents [ci skip]
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/raddrinfo.c | 18 | ||||
| -rw-r--r-- | ext/socket/socket.c | 10 |
2 files changed, 14 insertions, 14 deletions
diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index b601b1b297..4dd2867781 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -369,15 +369,15 @@ rb_getaddrinfo_a(const char *node, const char *service, arg.timeout = timeout; ret = (int)(VALUE)rb_thread_call_without_gvl(nogvl_gai_suspend, &arg, RUBY_UBF_IO, 0); - if (ret && ret != EAI_ALLDONE) { - /* EAI_ALLDONE indicates that the request already completed and gai_suspend was redundant */ - /* on Ubuntu 18.04 (or other systems), gai_suspend(3) returns EAI_SYSTEM/ENOENT on timeout */ - if (ret == EAI_SYSTEM && errno == ENOENT) { - return EAI_AGAIN; - } else { - return ret; + if (ret && ret != EAI_ALLDONE) { + /* EAI_ALLDONE indicates that the request already completed and gai_suspend was redundant */ + /* on Ubuntu 18.04 (or other systems), gai_suspend(3) returns EAI_SYSTEM/ENOENT on timeout */ + if (ret == EAI_SYSTEM && errno == ENOENT) { + return EAI_AGAIN; + } else { + return ret; + } } - } ret = gai_error(reqs[0]); @@ -943,7 +943,7 @@ call_getaddrinfo(VALUE node, VALUE service, } #ifdef HAVE_GETADDRINFO_A - res = rsock_getaddrinfo_a(node, service, &hints, socktype_hack, timeout); + res = rsock_getaddrinfo_a(node, service, &hints, socktype_hack, timeout); #else res = rsock_getaddrinfo(node, service, &hints, socktype_hack); #endif diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 3212467863..edf5f00626 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -1182,11 +1182,11 @@ sock_s_getaddrinfo(int argc, VALUE *argv, VALUE _) norevlookup = rsock_do_not_reverse_lookup; } - #ifdef HAVE_GETADDRINFO_A - res = rsock_getaddrinfo_a(host, port, &hints, 0, Qnil); - #else - res = rsock_getaddrinfo(host, port, &hints, 0); - #endif +#ifdef HAVE_GETADDRINFO_A + res = rsock_getaddrinfo_a(host, port, &hints, 0, Qnil); +#else + res = rsock_getaddrinfo(host, port, &hints, 0); +#endif ret = make_addrinfo(res, norevlookup); rb_freeaddrinfo(res); |