From 5f62b1d00ce8ca56ad624963ebdf01c572e73efc Mon Sep 17 00:00:00 2001 From: Misaki Shioi Date: Thu, 23 Nov 2023 16:52:18 +0900 Subject: [PATCH] Rename rsock_raise_socket_error to rsock_raise_resolution_error Again, rsock_raise_socket_error is called only when getaddrinfo and getaddrname fail --- ext/socket/init.c | 2 +- ext/socket/raddrinfo.c | 12 ++++++------ ext/socket/rubysocket.h | 2 +- ext/socket/socket.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ext/socket/init.c b/ext/socket/init.c index 10459710c249b0..dc9bd5acc89e60 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -38,7 +38,7 @@ static VALUE sym_wait_readable; static ID id_error_code; void -rsock_raise_socket_error(const char *reason, int error) +rsock_raise_resolution_error(const char *reason, int error) { #ifdef EAI_SYSTEM int e; diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index 78c94defc56830..683f9fa4b49b16 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -780,7 +780,7 @@ make_ipaddr0(struct sockaddr *addr, socklen_t addrlen, char *buf, size_t buflen) error = rb_getnameinfo(addr, addrlen, buf, buflen, NULL, 0, NI_NUMERICHOST); if (error) { - rsock_raise_socket_error("getnameinfo", error); + rsock_raise_resolution_error("getnameinfo", error); } } @@ -989,7 +989,7 @@ rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_h if (hostp && hostp[strlen(hostp)-1] == '\n') { rb_raise(rb_eSocket, "newline at the end of hostname"); } - rsock_raise_socket_error("getaddrinfo", error); + rsock_raise_resolution_error("getaddrinfo", error); } return res; @@ -1048,7 +1048,7 @@ rsock_ipaddr(struct sockaddr *sockaddr, socklen_t sockaddrlen, int norevlookup) error = rb_getnameinfo(sockaddr, sockaddrlen, hbuf, sizeof(hbuf), pbuf, sizeof(pbuf), NI_NUMERICHOST | NI_NUMERICSERV); if (error) { - rsock_raise_socket_error("getnameinfo", error); + rsock_raise_resolution_error("getnameinfo", error); } addr2 = rb_str_new2(hbuf); if (addr1 == Qnil) { @@ -1686,7 +1686,7 @@ rsock_inspect_sockaddr(struct sockaddr *sockaddr_arg, socklen_t socklen, VALUE r hbuf, (socklen_t)sizeof(hbuf), NULL, 0, NI_NUMERICHOST|NI_NUMERICSERV); if (error) { - rsock_raise_socket_error("getnameinfo", error); + rsock_raise_resolution_error("getnameinfo", error); } if (addr->sin6_port == 0) { rb_str_cat2(ret, hbuf); @@ -2054,7 +2054,7 @@ addrinfo_mdump(VALUE self) hbuf, (socklen_t)sizeof(hbuf), pbuf, (socklen_t)sizeof(pbuf), NI_NUMERICHOST|NI_NUMERICSERV); if (error) { - rsock_raise_socket_error("getnameinfo", error); + rsock_raise_resolution_error("getnameinfo", error); } sockaddr = rb_assoc_new(rb_str_new_cstr(hbuf), rb_str_new_cstr(pbuf)); break; @@ -2400,7 +2400,7 @@ addrinfo_getnameinfo(int argc, VALUE *argv, VALUE self) hbuf, (socklen_t)sizeof(hbuf), pbuf, (socklen_t)sizeof(pbuf), flags); if (error) { - rsock_raise_socket_error("getnameinfo", error); + rsock_raise_resolution_error("getnameinfo", error); } return rb_assoc_new(rb_str_new2(hbuf), rb_str_new2(pbuf)); diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h index 24e20efef1a99f..283735b12ce68c 100644 --- a/ext/socket/rubysocket.h +++ b/ext/socket/rubysocket.h @@ -308,7 +308,7 @@ VALUE rsock_sockaddr_string_value_with_addrinfo(volatile VALUE *v, VALUE *ai_ret VALUE rb_check_sockaddr_string_type(VALUE); -NORETURN(void rsock_raise_socket_error(const char *, int)); +NORETURN(void rsock_raise_resolution_error(const char *, int)); int rsock_family_arg(VALUE domain); int rsock_socktype_arg(VALUE type); diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 74cb0644e6f643..c780d77cf6c317 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -1313,7 +1313,7 @@ sock_s_getnameinfo(int argc, VALUE *argv, VALUE _) saved_errno = errno; if (res) rb_freeaddrinfo(res); errno = saved_errno; - rsock_raise_socket_error("getnameinfo", error); + rsock_raise_resolution_error("getnameinfo", error); UNREACHABLE_RETURN(Qnil); }