Skip to content

Commit 3700ae2

Browse files
haruna-tsujitaharuna-tsujita
authored
Fix typos finised -> finished (ruby#13104)
1 parent 8c9cd65 commit 3700ae2

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

‎ext/socket/ipsocket.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ struct hostname_resolution_store
295295
{
296296
struct hostname_resolution_result v6;
297297
struct hostname_resolution_result v4;
298-
int is_all_finised;
298+
int is_all_finished;
299299
};
300300

301301
static int
@@ -527,7 +527,7 @@ init_fast_fallback_inetsock_internal(VALUE v)
527527
struct timeval *delay_p = NULL;
528528

529529
struct hostname_resolution_store resolution_store;
530-
resolution_store.is_all_finised = false;
530+
resolution_store.is_all_finished = false;
531531
resolution_store.v6.ai = NULL;
532532
resolution_store.v6.finished = false;
533533
resolution_store.v6.has_error = false;
@@ -574,7 +574,7 @@ init_fast_fallback_inetsock_internal(VALUE v)
574574
resolution_store.v4.finished = true;
575575
resolution_store.v6.finished = true;
576576
}
577-
resolution_store.is_all_finised = true;
577+
resolution_store.is_all_finished = true;
578578
} else {
579579
if (pipe(pipefd) != 0) rb_syserr_fail(errno, "pipe(2)");
580580
hostname_resolution_waiter = pipefd[0];
@@ -664,7 +664,7 @@ init_fast_fallback_inetsock_internal(VALUE v)
664664
if (remote_ai->ai_family == AF_INET6) {
665665
if (any_addrinfos(&resolution_store)) continue;
666666
if (!in_progress_fds(arg->connection_attempt_fds_size)) break;
667-
if (resolution_store.is_all_finised) break;
667+
if (resolution_store.is_all_finished) break;
668668

669669
if (local_status < 0) {
670670
host = arg->local.host;
@@ -690,7 +690,7 @@ init_fast_fallback_inetsock_internal(VALUE v)
690690
if (!local_ai) {
691691
if (any_addrinfos(&resolution_store)) continue;
692692
if (in_progress_fds(arg->connection_attempt_fds_size)) break;
693-
if (!resolution_store.is_all_finised) break;
693+
if (!resolution_store.is_all_finished) break;
694694

695695
/* Use a different family local address if no choice, this
696696
* will cause EAFNOSUPPORT. */
@@ -707,7 +707,7 @@ init_fast_fallback_inetsock_internal(VALUE v)
707707

708708
if (any_addrinfos(&resolution_store)) continue;
709709
if (in_progress_fds(arg->connection_attempt_fds_size)) break;
710-
if (!resolution_store.is_all_finised) break;
710+
if (!resolution_store.is_all_finished) break;
711711

712712
if (local_status < 0) {
713713
host = arg->local.host;
@@ -743,7 +743,7 @@ init_fast_fallback_inetsock_internal(VALUE v)
743743

744744
if (any_addrinfos(&resolution_store)) continue;
745745
if (in_progress_fds(arg->connection_attempt_fds_size)) break;
746-
if (!resolution_store.is_all_finised) break;
746+
if (!resolution_store.is_all_finished) break;
747747

748748
if (local_status < 0) {
749749
host = arg->local.host;
@@ -764,7 +764,7 @@ init_fast_fallback_inetsock_internal(VALUE v)
764764

765765
if (any_addrinfos(&resolution_store) ||
766766
in_progress_fds(arg->connection_attempt_fds_size) ||
767-
!resolution_store.is_all_finised) {
767+
!resolution_store.is_all_finished) {
768768
socket_nonblock_set(fd);
769769
status = connect(fd, remote_ai->ai_addr, remote_ai->ai_addrlen);
770770
last_family = remote_ai->ai_family;
@@ -824,7 +824,7 @@ init_fast_fallback_inetsock_internal(VALUE v)
824824

825825
if (any_addrinfos(&resolution_store)) continue;
826826
if (in_progress_fds(arg->connection_attempt_fds_size)) break;
827-
if (!resolution_store.is_all_finised) break;
827+
if (!resolution_store.is_all_finished) break;
828828

829829
if (local_status < 0) {
830830
host = arg->local.host;
@@ -922,7 +922,7 @@ init_fast_fallback_inetsock_internal(VALUE v)
922922

923923
if (any_addrinfos(&resolution_store)) continue;
924924
if (in_progress_fds(arg->connection_attempt_fds_size)) break;
925-
if (!resolution_store.is_all_finised) break;
925+
if (!resolution_store.is_all_finished) break;
926926

927927
if (local_status < 0) {
928928
host = arg->local.host;
@@ -961,7 +961,7 @@ init_fast_fallback_inetsock_internal(VALUE v)
961961
if (connected_fd >= 0) break;
962962

963963
if (!in_progress_fds(arg->connection_attempt_fds_size)) {
964-
if (!any_addrinfos(&resolution_store) && resolution_store.is_all_finised) {
964+
if (!any_addrinfos(&resolution_store) && resolution_store.is_all_finished) {
965965
if (local_status < 0) {
966966
host = arg->local.host;
967967
serv = arg->local.serv;
@@ -981,7 +981,7 @@ init_fast_fallback_inetsock_internal(VALUE v)
981981
}
982982

983983
/* check for hostname resolution */
984-
if (!resolution_store.is_all_finised && rb_fd_isset(hostname_resolution_waiter, &arg->readfds)) {
984+
if (!resolution_store.is_all_finished && rb_fd_isset(hostname_resolution_waiter, &arg->readfds)) {
985985
while (true) {
986986
resolved_type_size = read(
987987
hostname_resolution_waiter,
@@ -1007,7 +1007,7 @@ init_fast_fallback_inetsock_internal(VALUE v)
10071007
resolution_store.v6.ai = arg->getaddrinfo_entries[IPV6_ENTRY_POS]->ai;
10081008
}
10091009
if (resolution_store.v4.finished) {
1010-
resolution_store.is_all_finised = true;
1010+
resolution_store.is_all_finished = true;
10111011
resolution_delay_expires_at = NULL;
10121012
user_specified_resolv_timeout_at = NULL;
10131013
break;
@@ -1027,7 +1027,7 @@ init_fast_fallback_inetsock_internal(VALUE v)
10271027
}
10281028

10291029
if (resolution_store.v6.finished) {
1030-
resolution_store.is_all_finised = true;
1030+
resolution_store.is_all_finished = true;
10311031
resolution_delay_expires_at = NULL;
10321032
user_specified_resolv_timeout_at = NULL;
10331033
break;
@@ -1055,7 +1055,7 @@ init_fast_fallback_inetsock_internal(VALUE v)
10551055
}
10561056

10571057
/* For cases where write(2) fails in child threads */
1058-
if (!resolution_store.is_all_finised) {
1058+
if (!resolution_store.is_all_finished) {
10591059
if (!resolution_store.v6.finished && arg->getaddrinfo_entries[IPV6_ENTRY_POS]->has_syserr) {
10601060
resolution_store.v6.finished = true;
10611061

@@ -1071,7 +1071,7 @@ init_fast_fallback_inetsock_internal(VALUE v)
10711071
}
10721072

10731073
if (resolution_store.v4.finished) {
1074-
resolution_store.is_all_finised = true;
1074+
resolution_store.is_all_finished = true;
10751075
resolution_delay_expires_at = NULL;
10761076
user_specified_resolv_timeout_at = NULL;
10771077
}
@@ -1091,7 +1091,7 @@ init_fast_fallback_inetsock_internal(VALUE v)
10911091
}
10921092

10931093
if (resolution_store.v6.finished) {
1094-
resolution_store.is_all_finised = true;
1094+
resolution_store.is_all_finished = true;
10951095
resolution_delay_expires_at = NULL;
10961096
user_specified_resolv_timeout_at = NULL;
10971097
} else {
@@ -1103,7 +1103,7 @@ init_fast_fallback_inetsock_internal(VALUE v)
11031103

11041104
if (!any_addrinfos(&resolution_store)) {
11051105
if (!in_progress_fds(arg->connection_attempt_fds_size) &&
1106-
resolution_store.is_all_finised) {
1106+
resolution_store.is_all_finished) {
11071107
if (local_status < 0) {
11081108
host = arg->local.host;
11091109
serv = arg->local.serv;
@@ -1119,7 +1119,7 @@ init_fast_fallback_inetsock_internal(VALUE v)
11191119
}
11201120

11211121
if ((is_timeout_tv(user_specified_resolv_timeout_at, now) ||
1122-
resolution_store.is_all_finised) &&
1122+
resolution_store.is_all_finished) &&
11231123
(is_timeout_tv(user_specified_connect_timeout_at, now) ||
11241124
!in_progress_fds(arg->connection_attempt_fds_size))) {
11251125
VALUE errno_module = rb_const_get(rb_cObject, rb_intern("Errno"));

0 commit comments

Comments
 (0)