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

vstinner · tiran · web-flow · commit 9d73adf7a450 · 2022-06-20T16:09:55.000+02: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
@@ -341,7 +341,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
@@ -185,8 +185,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)
 {
@@ -202,7 +202,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
@@ -996,6 +996,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
@@ -1015,6 +1016,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

Original file line number	Diff line number	Diff line change
`@@ -185,8 +185,8 @@ compare_handler(PyObject func, PyObject dfl_ign_handler)`
`185`	`185`	`return PyObject_RichCompareBool(func, dfl_ign_handler, Py_EQ) == 1;`
`186`	`186`	`}`
`187`	`187`
`188`		`-#ifdef HAVE_GETITIMER`
`189`		`-/* auxiliary functions for setitimer */`
	`188`	`+#ifdef HAVE_SETITIMER`
	`189`	`+/* auxiliary function for setitimer */`
`190`	`190`	`static int`
`191`	`191`	`timeval_from_double(PyObject obj, struct timeval tv)`
`192`	`192`	`{`
`@@ -202,7 +202,10 @@ timeval_from_double(PyObject obj, struct timeval tv)`
`202`	`202`	`}`
`203`	`203`	`return _PyTime_AsTimeval(t, tv, _PyTime_ROUND_CEILING);`
`204`	`204`	`}`
	`205`	`+#endif`
`205`	`206`
	`207`	`+#if defined(HAVE_SETITIMER) \|\| defined(HAVE_GETITIMER)`
	`208`	`+/* auxiliary functions for get/setitimer */`
`206`	`209`	`Py_LOCAL_INLINE(double)`
`207`	`210`	`double_from_timeval(struct timeval *tv)`
`208`	`211`	`{`
Original file line number	Diff line number	Diff line change
`@@ -996,6 +996,7 @@ init_sockobject(PySocketSockObject *s,`
`996`	`996`	`}`
`997`	`997`
`998`	`998`
	`999`	`+#ifdef HAVE_SOCKETPAIR`
`999`	`1000`	`/* Create a new socket object.`
`1000`	`1001`	`This just creates the object and initializes it.`
`1001`	`1002`	`If the creation fails, return NULL and set an exception (implicit`
`@@ -1015,6 +1016,7 @@ new_sockobject(SOCKET_T fd, int family, int type, int proto)`
`1015`	`1016`	`}`
`1016`	`1017`	`return s;`
`1017`	`1018`	`}`
	`1019`	`+#endif`
`1018`	`1020`
`1019`	`1021`
`1020`	`1022`	`/* Lock to allow python interpreter to continue, but only allow one`