[3.14] gh-132775: Fix Recently Introduced Warnings (gh-134532)

miss-islington · ericsnowcurrently · web-flow · commit 7480e5021729 · 2025-05-22T17:49:05.000Z
(cherry picked from commit ac06b53, AKA gh-134530) Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
diff --git a/Modules/_interpchannelsmodule.c b/Modules/_interpchannelsmodule.c
@@ -3443,7 +3443,7 @@ channelsmod_get_channel_defaults(PyObject *self, PyObject *args, PyObject *kwds)
     }
     int64_t cid = cid_data.cid;
 
-    struct _channeldefaults defaults;
+    struct _channeldefaults defaults = {0};
     int err = channel_get_defaults(&_globals.channels, cid, &defaults);
     if (handle_channel_error(err, self, cid)) {
         return NULL;
diff --git a/Modules/_interpqueuesmodule.c b/Modules/_interpqueuesmodule.c
@@ -1772,7 +1772,7 @@ queuesmod_get_queue_defaults(PyObject *self, PyObject *args, PyObject *kwds)
     }
     int64_t qid = qidarg.id;
 
-    struct _queuedefaults defaults;
+    struct _queuedefaults defaults = {0};
     int err = queue_get_defaults(&_globals.queues, qid, &defaults);
     if (handle_queue_error(err, self, qid)) {
         return NULL;
diff --git a/Python/crossinterp.c b/Python/crossinterp.c
@@ -1795,6 +1795,7 @@ typedef struct _sharednsitem {
     // in a different interpreter to release the XI data.
 } _PyXI_namespace_item;
 
+#ifndef NDEBUG
 static int
 _sharednsitem_is_initialized(_PyXI_namespace_item *item)
 {
@@ -1803,6 +1804,7 @@ _sharednsitem_is_initialized(_PyXI_namespace_item *item)
     }
     return 0;
 }
+#endif
 
 static int
 _sharednsitem_init(_PyXI_namespace_item *item, PyObject *key)

Original file line number	Diff line number	Diff line change
`@@ -3443,7 +3443,7 @@ channelsmod_get_channel_defaults(PyObject self, PyObject args, PyObject *kwds)`
`3443`	`3443`	`}`
`3444`	`3444`	`int64_t cid = cid_data.cid;`
`3445`	`3445`
`3446`		`- struct _channeldefaults defaults;`
	`3446`	`+ struct _channeldefaults defaults = {0};`
`3447`	`3447`	`int err = channel_get_defaults(&_globals.channels, cid, &defaults);`
`3448`	`3448`	`if (handle_channel_error(err, self, cid)) {`
`3449`	`3449`	`return NULL;`
Original file line number	Diff line number	Diff line change
`@@ -1772,7 +1772,7 @@ queuesmod_get_queue_defaults(PyObject self, PyObject args, PyObject *kwds)`
`1772`	`1772`	`}`
`1773`	`1773`	`int64_t qid = qidarg.id;`
`1774`	`1774`
`1775`		`- struct _queuedefaults defaults;`
	`1775`	`+ struct _queuedefaults defaults = {0};`
`1776`	`1776`	`int err = queue_get_defaults(&_globals.queues, qid, &defaults);`
`1777`	`1777`	`if (handle_queue_error(err, self, qid)) {`
`1778`	`1778`	`return NULL;`
Original file line number	Diff line number	Diff line change
`@@ -1795,6 +1795,7 @@ typedef struct _sharednsitem {`
`1795`	`1795`	`// in a different interpreter to release the XI data.`
`1796`	`1796`	`} _PyXI_namespace_item;`
`1797`	`1797`
	`1798`	`+#ifndef NDEBUG`
`1798`	`1799`	`static int`
`1799`	`1800`	`_sharednsitem_is_initialized(_PyXI_namespace_item *item)`
`1800`	`1801`	`{`
`@@ -1803,6 +1804,7 @@ _sharednsitem_is_initialized(_PyXI_namespace_item *item)`
`1803`	`1804`	`}`
`1804`	`1805`	`return 0;`
`1805`	`1806`	`}`
	`1807`	`+#endif`
`1806`	`1808`
`1807`	`1809`	`static int`
`1808`	`1810`	`_sharednsitem_init(_PyXI_namespace_item item, PyObject key)`