Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Christian Heimes 2022-06-20 13:34:40 +02:00 committed by GitHub
parent affa9f22cf
commit 774ef28814
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/_io/bufferedio.c
View File

@ -328,7 +328,7 @@ _enter_buffered_busy(buffered *self)
: buffered_closed(self))) : buffered_closed(self)))
#define CHECK_CLOSED(self, error_msg) \ #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); \ PyErr_SetString(PyExc_ValueError, error_msg); \
return NULL; \ return NULL; \
} \ } \

3
Modules/getnameinfo.c
View File

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

7
Modules/signalmodule.c
View File

@ -189,8 +189,8 @@ compare_handler(PyObject *func, PyObject *dfl_ign_handler)
return PyObject_RichCompareBool(func, dfl_ign_handler, Py_EQ) == 1; return PyObject_RichCompareBool(func, dfl_ign_handler, Py_EQ) == 1;
} }
#ifdef HAVE_GETITIMER #ifdef HAVE_SETITIMER
/* auxiliary functions for setitimer */ /* auxiliary function for setitimer */
static int static int
timeval_from_double(PyObject *obj, struct timeval *tv) 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); 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) Py_LOCAL_INLINE(double)
double_from_timeval(struct timeval *tv) double_from_timeval(struct timeval *tv)
{ {

2
Modules/socketmodule.c
View File

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

2
Objects/stringlib/fastsearch.h
View File

@ -355,7 +355,7 @@ STRINGLIB(_preprocess)(const STRINGLIB_CHAR *needle, Py_ssize_t len_needle,
} }
// Fill up a compressed Boyer-Moore "Bad Character" table // Fill up a compressed Boyer-Moore "Bad Character" table
Py_ssize_t not_found_shift = Py_MIN(len_needle, MAX_SHIFT); Py_ssize_t not_found_shift = Py_MIN(len_needle, MAX_SHIFT);
for (Py_ssize_t i = 0; i < TABLE_SIZE; i++) { for (Py_ssize_t i = 0; i < (Py_ssize_t)TABLE_SIZE; i++) {
p->table[i] = Py_SAFE_DOWNCAST(not_found_shift, p->table[i] = Py_SAFE_DOWNCAST(not_found_shift,
Py_ssize_t, SHIFT_TYPE); Py_ssize_t, SHIFT_TYPE);
} }

2
configure generated vendored
View File

@ -24652,7 +24652,7 @@ $as_echo_n "checking for stdlib extension module _ctypes_test... " >&6; }
if test "$py_cv_module__ctypes_test" != "n/a"; then : if test "$py_cv_module__ctypes_test" != "n/a"; then :
if test "$TEST_MODULES" = yes; then : if test "$TEST_MODULES" = yes; then :
if true; then : if test "$ac_cv_func_dlopen" = yes; then :
py_cv_module__ctypes_test=yes py_cv_module__ctypes_test=yes
else else
py_cv_module__ctypes_test=missing py_cv_module__ctypes_test=missing

2
configure.ac
View File

@ -6911,7 +6911,7 @@ PY_STDLIB_MOD([_testbuffer], [test "$TEST_MODULES" = yes])
PY_STDLIB_MOD([_testimportmultiple], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes]) PY_STDLIB_MOD([_testimportmultiple], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes])
PY_STDLIB_MOD([_testmultiphase], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes]) PY_STDLIB_MOD([_testmultiphase], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes])
PY_STDLIB_MOD([_xxtestfuzz], [test "$TEST_MODULES" = yes]) PY_STDLIB_MOD([_xxtestfuzz], [test "$TEST_MODULES" = yes])
PY_STDLIB_MOD([_ctypes_test], [test "$TEST_MODULES" = yes], [], [], [-lm]) PY_STDLIB_MOD([_ctypes_test], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes], [], [-lm])
dnl Limited API template modules. dnl Limited API template modules.
dnl The limited C API is not compatible with the Py_TRACE_REFS macro. dnl The limited C API is not compatible with the Py_TRACE_REFS macro.