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

miss-islington · tiran · web-flow · commit 81686e701cda · 2022-06-20T05:08:14.000-07:00
(cherry picked from commit 774ef28) Co-authored-by: Christian Heimes <christian@python.org>
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
@@ -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; \
     } \
diff --git a/Modules/getnameinfo.c b/Modules/getnameinfo.c
@@ -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) {
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
@@ -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)
 {
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
@@ -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
diff --git a/Objects/stringlib/fastsearch.h b/Objects/stringlib/fastsearch.h
@@ -345,7 +345,7 @@ STRINGLIB(_preprocess)(const STRINGLIB_CHAR *needle, Py_ssize_t len_needle,
     }
     // Fill up a compressed Boyer-Moore "Bad Character" table
     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,
                                        Py_ssize_t, SHIFT_TYPE);
     }
diff --git a/configure b/configure
diff --git a/configure.ac b/configure.ac
@@ -6977,7 +6977,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([_testmultiphase], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = 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 The limited C API is not compatible with the Py_TRACE_REFS macro.

Original file line number	Diff line number	Diff line change
`@@ -189,8 +189,8 @@ compare_handler(PyObject func, PyObject dfl_ign_handler)`
`189`	`189`	`return PyObject_RichCompareBool(func, dfl_ign_handler, Py_EQ) == 1;`
`190`	`190`	`}`
`191`	`191`
`192`		`-#ifdef HAVE_GETITIMER`
`193`		`-/* auxiliary functions for setitimer */`
	`192`	`+#ifdef HAVE_SETITIMER`
	`193`	`+/* auxiliary function for setitimer */`
`194`	`194`	`static int`
`195`	`195`	`timeval_from_double(PyObject obj, struct timeval tv)`
`196`	`196`	`{`
`@@ -206,7 +206,10 @@ timeval_from_double(PyObject obj, struct timeval tv)`
`206`	`206`	`}`
`207`	`207`	`return _PyTime_AsTimeval(t, tv, _PyTime_ROUND_CEILING);`
`208`	`208`	`}`
	`209`	`+#endif`
`209`	`210`
	`211`	`+#if defined(HAVE_SETITIMER) \|\| defined(HAVE_GETITIMER)`
	`212`	`+/* auxiliary functions for get/setitimer */`
`210`	`213`	`Py_LOCAL_INLINE(double)`
`211`	`214`	`double_from_timeval(struct timeval *tv)`
`212`	`215`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1013,6 +1013,7 @@ init_sockobject(PySocketSockObject *s,`
`1013`	`1013`	`}`
`1014`	`1014`
`1015`	`1015`
	`1016`	`+#ifdef HAVE_SOCKETPAIR`
`1016`	`1017`	`/* Create a new socket object.`
`1017`	`1018`	`This just creates the object and initializes it.`
`1018`	`1019`	`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)`
`1032`	`1033`	`}`
`1033`	`1034`	`return s;`
`1034`	`1035`	`}`
	`1036`	`+#endif`
`1035`	`1037`
`1036`	`1038`
`1037`	`1039`	`/* Lock to allow python interpreter to continue, but only allow one`
Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ STRINGLIB(_preprocess)(const STRINGLIB_CHAR *needle, Py_ssize_t len_needle,`
`345`	`345`	`}`
`346`	`346`	`// Fill up a compressed Boyer-Moore "Bad Character" table`
`347`	`347`	`Py_ssize_t not_found_shift = Py_MIN(len_needle, MAX_SHIFT);`
`348`		`- for (Py_ssize_t i = 0; i < TABLE_SIZE; i++) {`
	`348`	`+ for (Py_ssize_t i = 0; i < (Py_ssize_t)TABLE_SIZE; i++) {`
`349`	`349`	`p->table[i] = Py_SAFE_DOWNCAST(not_found_shift,`
`350`	`350`	`Py_ssize_t, SHIFT_TYPE);`
`351`	`351`	`}`