1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename rsock_raise_socket_error to rsock_raise_resolution_error

Browse Source 
Again, rsock_raise_socket_error is called only when getaddrinfo and getaddrname fail
This commit is contained in:
Misaki Shioi 2023-11-23 16:52:18 +09:00 committed by Yusuke Endoh
parent 52f6de4196
commit 5f62b1d00c
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/socket/init.c
View File

@ -38,7 +38,7 @@ static VALUE sym_wait_readable;
static ID id_error_code; static ID id_error_code;
void void
rsock_raise_socket_error(const char *reason, int error) rsock_raise_resolution_error(const char *reason, int error)
{ {
#ifdef EAI_SYSTEM #ifdef EAI_SYSTEM
int e; int e;

12
ext/socket/raddrinfo.c
View File

@ -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); error = rb_getnameinfo(addr, addrlen, buf, buflen, NULL, 0, NI_NUMERICHOST);
if (error) { 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') { if (hostp && hostp[strlen(hostp)-1] == '\n') {
rb_raise(rb_eSocket, "newline at the end of hostname"); rb_raise(rb_eSocket, "newline at the end of hostname");
} }
rsock_raise_socket_error("getaddrinfo", error); rsock_raise_resolution_error("getaddrinfo", error);
} }
return res; return res;
@ -1048,7 +1048,7 @@ rsock_ipaddr(struct sockaddr *sockaddr, socklen_t sockaddrlen, int norevlookup)
error = rb_getnameinfo(sockaddr, sockaddrlen, hbuf, sizeof(hbuf), error = rb_getnameinfo(sockaddr, sockaddrlen, hbuf, sizeof(hbuf),
pbuf, sizeof(pbuf), NI_NUMERICHOST | NI_NUMERICSERV); pbuf, sizeof(pbuf), NI_NUMERICHOST | NI_NUMERICSERV);
if (error) { if (error) {
rsock_raise_socket_error("getnameinfo", error); rsock_raise_resolution_error("getnameinfo", error);
} }
addr2 = rb_str_new2(hbuf); addr2 = rb_str_new2(hbuf);
if (addr1 == Qnil) { 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, hbuf, (socklen_t)sizeof(hbuf), NULL, 0,
NI_NUMERICHOST|NI_NUMERICSERV); NI_NUMERICHOST|NI_NUMERICSERV);
if (error) { if (error) {
rsock_raise_socket_error("getnameinfo", error); rsock_raise_resolution_error("getnameinfo", error);
} }
if (addr->sin6_port == 0) { if (addr->sin6_port == 0) {
rb_str_cat2(ret, hbuf); rb_str_cat2(ret, hbuf);
@ -2054,7 +2054,7 @@ addrinfo_mdump(VALUE self)
hbuf, (socklen_t)sizeof(hbuf), pbuf, (socklen_t)sizeof(pbuf), hbuf, (socklen_t)sizeof(hbuf), pbuf, (socklen_t)sizeof(pbuf),
NI_NUMERICHOST|NI_NUMERICSERV); NI_NUMERICHOST|NI_NUMERICSERV);
if (error) { 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)); sockaddr = rb_assoc_new(rb_str_new_cstr(hbuf), rb_str_new_cstr(pbuf));
break; break;
@ -2400,7 +2400,7 @@ addrinfo_getnameinfo(int argc, VALUE *argv, VALUE self)
hbuf, (socklen_t)sizeof(hbuf), pbuf, (socklen_t)sizeof(pbuf), hbuf, (socklen_t)sizeof(hbuf), pbuf, (socklen_t)sizeof(pbuf),
flags); flags);
if (error) { 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)); return rb_assoc_new(rb_str_new2(hbuf), rb_str_new2(pbuf));

2
ext/socket/rubysocket.h
View File

@ -308,7 +308,7 @@ VALUE rsock_sockaddr_string_value_with_addrinfo(volatile VALUE *v, VALUE *ai_ret
VALUE rb_check_sockaddr_string_type(VALUE); 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_family_arg(VALUE domain);
int rsock_socktype_arg(VALUE type); int rsock_socktype_arg(VALUE type);

2
ext/socket/socket.c
View File

@ -1313,7 +1313,7 @@ sock_s_getnameinfo(int argc, VALUE *argv, VALUE _)
saved_errno = errno; saved_errno = errno;
if (res) rb_freeaddrinfo(res); if (res) rb_freeaddrinfo(res);
errno = saved_errno; errno = saved_errno;
rsock_raise_socket_error("getnameinfo", error); rsock_raise_resolution_error("getnameinfo", error);
UNREACHABLE_RETURN(Qnil); UNREACHABLE_RETURN(Qnil);
} }