gh-84461: Silence some compiler warnings on WASM (GH-93978)

(cherry picked from commit 774ef28814)

Co-authored-by: Christian Heimes <christian@python.org>
This commit is contained in:
Miss Islington (bot) 2022-06-20 05:08:14 -07:00 committed by GitHub
parent 5abe4cbe88
commit 81686e701c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 8 deletions

View file

@ -328,7 +328,7 @@ _enter_buffered_busy(buffered *self)
: buffered_closed(self)))
#define CHECK_CLOSED(self, error_msg) \
if (IS_CLOSED(self) & (Py_SAFE_DOWNCAST(READAHEAD(self), Py_off_t, Py_ssize_t) == 0)) { \
if (IS_CLOSED(self) && (Py_SAFE_DOWNCAST(READAHEAD(self), Py_off_t, Py_ssize_t) == 0)) { \
PyErr_SetString(PyExc_ValueError, error_msg); \
return NULL; \
} \

View file

@ -104,8 +104,8 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
u_long v4a;
#ifdef ENABLE_IPV6
u_char pfx;
#endif
int h_error;
#endif
char numserv[512];
char numaddr[512];
@ -181,7 +181,6 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
hp = getipnodebyaddr(addr, gni_afd->a_addrlen, gni_afd->a_af, &h_error);
#else
hp = gethostbyaddr(addr, gni_afd->a_addrlen, gni_afd->a_af);
h_error = h_errno;
#endif
if (hp) {

View file

@ -189,8 +189,8 @@ compare_handler(PyObject *func, PyObject *dfl_ign_handler)
return PyObject_RichCompareBool(func, dfl_ign_handler, Py_EQ) == 1;
}
#ifdef HAVE_GETITIMER
/* auxiliary functions for setitimer */
#ifdef HAVE_SETITIMER
/* auxiliary function for setitimer */
static int
timeval_from_double(PyObject *obj, struct timeval *tv)
{
@ -206,7 +206,10 @@ timeval_from_double(PyObject *obj, struct timeval *tv)
}
return _PyTime_AsTimeval(t, tv, _PyTime_ROUND_CEILING);
}
#endif
#if defined(HAVE_SETITIMER) || defined(HAVE_GETITIMER)
/* auxiliary functions for get/setitimer */
Py_LOCAL_INLINE(double)
double_from_timeval(struct timeval *tv)
{

View file

@ -1013,6 +1013,7 @@ init_sockobject(PySocketSockObject *s,
}
#ifdef HAVE_SOCKETPAIR
/* Create a new socket object.
This just creates the object and initializes it.
If the creation fails, return NULL and set an exception (implicit
@ -1032,6 +1033,7 @@ new_sockobject(SOCKET_T fd, int family, int type, int proto)
}
return s;
}
#endif
/* Lock to allow python interpreter to continue, but only allow one