Skip to content

Commit 13d14da

Browse files
Use sock pointer from sock type context where applicable
1 parent d839af0 commit 13d14da

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

Modules/socketmodule.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,7 +1747,6 @@ static int
17471747
getsockaddrarg(PySocketSockObject *s, PyObject *args,
17481748
sock_addr_t *addrbuf, int *len_ret, const char *caller)
17491749
{
1750-
socket_state *state = GLOBAL_STATE();
17511750
switch (s->sock_family) {
17521751

17531752
#if defined(AF_UNIX)
@@ -1913,7 +1912,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
19131912
return 0;
19141913
}
19151914
struct sockaddr_in* addr = &addrbuf->in;
1916-
result = setipaddr(state, host.buf, (struct sockaddr *)addr,
1915+
result = setipaddr(s->state, host.buf, (struct sockaddr *)addr,
19171916
sizeof(*addr), AF_INET);
19181917
idna_cleanup(&host);
19191918
if (result < 0)
@@ -1958,7 +1957,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
19581957
return 0;
19591958
}
19601959
struct sockaddr_in6* addr = &addrbuf->in6;
1961-
result = setipaddr(state, host.buf, (struct sockaddr *)addr,
1960+
result = setipaddr(s->state, host.buf, (struct sockaddr *)addr,
19621961
sizeof(*addr), AF_INET6);
19631962
idna_cleanup(&host);
19641963
if (result < 0)
@@ -2855,7 +2854,7 @@ sock_accept_impl(PySocketSockObject *s, void *data)
28552854
#endif
28562855

28572856
#if defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC)
2858-
socket_state *state = GLOBAL_STATE();
2857+
socket_state *state = s->state;
28592858
if (state->accept4_works != 0) {
28602859
ctx->result = accept4(s->sock_fd, addr, paddrlen,
28612860
SOCK_CLOEXEC);
@@ -2917,7 +2916,7 @@ sock_accept(PySocketSockObject *s, PyObject *Py_UNUSED(ignored))
29172916
#else
29182917

29192918
#if defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC)
2920-
socket_state *state = GLOBAL_STATE();
2919+
socket_state *state = s->state;
29212920
if (!state->accept4_works)
29222921
#endif
29232922
{

0 commit comments

Comments
 (0)