bpo-30074: Fix compile warnings of _PySlice_Unpack and convert missed (#1154)

PySlice_GetIndicesEx in _ctypes.c.

diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index 7edd94c56214f8bcc8ab1b40ce7cc3cd1ba3828b..4e192fb3ad28187e7429457d698a82705eb68b43 100644 (file)
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -4434,9 +4434,7 @@ Array_subscript(PyObject *_self, PyObject *item)
         PyObject *np;
         Py_ssize_t start, stop, step, slicelen, cur, i;
 
-        if (PySlice_GetIndicesEx((PySliceObject *)item,
-                                 self->b_length, &start, &stop,
-                                 &step, &slicelen) < 0) {
+        if (_PySlice_Unpack(item, &start, &stop, &step) < 0) {
             return NULL;
         }
 
@@ -4447,6 +4445,7 @@ Array_subscript(PyObject *_self, PyObject *item)
         assert(itemdict); /* proto is the item type of the array, a
                              ctypes type, so this cannot be NULL */
 
+        slicelen = _PySlice_AdjustIndices(self->b_length, &start, &stop, step);
         if (itemdict->getfunc == _ctypes_get_fielddesc("c")->getfunc) {
             char *ptr = (char *)self->b_ptr;
             char *dest;
@@ -4613,7 +4612,7 @@ Array_ass_subscript(PyObject *_self, PyObject *item, PyObject *value)
     else if (PySlice_Check(item)) {
         Py_ssize_t start, stop, step, slicelen, otherlen, i, cur;
 
-        if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
+        if (_PySlice_Unpack(item, &start, &stop, &step) < 0) {
             return -1;
         }
         slicelen = _PySlice_AdjustIndices(self->b_length, &start, &stop, step);

diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index 71ffc580712c47d1411b19cbf3d0b0b4efd3f8fb..0a01c3cfada620688783db07e7457c1027166b1e 100644 (file)
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -1334,7 +1334,7 @@ element_subscr(PyObject* self_, PyObject* item)
         if (!self->extra)
             return PyList_New(0);
 
-        if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
+        if (_PySlice_Unpack(item, &start, &stop, &step) < 0) {
             return NULL;
         }
         slicelen = _PySlice_AdjustIndices(self->extra->length, &start, &stop,
@@ -1393,7 +1393,7 @@ element_ass_subscr(PyObject* self_, PyObject* item, PyObject* value)
         if (!self->extra)
             element_new_extra(self, NULL);
 
-        if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
+        if (_PySlice_Unpack(item, &start, &stop, &step) < 0) {
             return -1;
         }
         slicelen = _PySlice_AdjustIndices(self->extra->length, &start, &stop,

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 310ce7a37e969e97f509034759bb3c5905d5f64a..f6f597a046cdcf33fd9077576f3d05c9089dd797 100644 (file)
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -1701,7 +1701,7 @@ array_subscr(arrayobject* self, PyObject* item)
         arrayobject* ar;
         int itemsize = self->ob_descr->itemsize;
 
-        if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
+        if (_PySlice_Unpack(item, &start, &stop, &step) < 0) {
             return NULL;
         }
         slicelength = _PySlice_AdjustIndices(Py_SIZE(self), &start, &stop,
@@ -1773,7 +1773,7 @@ array_ass_subscr(arrayobject* self, PyObject* item, PyObject* value)
             return (*self->ob_descr->setitem)(self, i, value);
     }
     else if (PySlice_Check(item)) {
-        if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
+        if (_PySlice_Unpack(item, &start, &stop, &step) < 0) {
             return -1;
         }
         slicelength = _PySlice_AdjustIndices(Py_SIZE(self), &start, &stop,

diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index 4f4c95999c5cd0d403a7505de6c9044424d8f06a..5532c4484db2f6eb364fd8dedb7add6f4a988198 100644 (file)
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -784,7 +784,7 @@ mmap_subscript(mmap_object *self, PyObject *item)
     else if (PySlice_Check(item)) {
         Py_ssize_t start, stop, step, slicelen;
 
-        if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
+        if (_PySlice_Unpack(item, &start, &stop, &step) < 0) {
             return NULL;
         }
         slicelen = _PySlice_AdjustIndices(self->size, &start, &stop, step);
@@ -939,7 +939,7 @@ mmap_ass_subscript(mmap_object *self, PyObject *item, PyObject *value)
     else if (PySlice_Check(item)) {
         Py_ssize_t start, stop, step, slicelen;
 
-        if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
+        if (_PySlice_Unpack(item, &start, &stop, &step) < 0) {
             return -1;
         }
         slicelen = _PySlice_AdjustIndices(self->size, &start, &stop, step);

diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 8c17245266111806b32deb445ca7e2d519259970..72f2ad8eea39797891e87a60417e395607dbafd6 100644 (file)
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -435,7 +435,7 @@ bytearray_subscript(PyByteArrayObject *self, PyObject *index)
     }
     else if (PySlice_Check(index)) {
         Py_ssize_t start, stop, step, slicelength, cur, i;
-        if (_PySlice_Unpack((PySliceObject *)index, &start, &stop, &step) < 0) {
+        if (_PySlice_Unpack(index, &start, &stop, &step) < 0) {
             return NULL;
         }
         slicelength = _PySlice_AdjustIndices(PyByteArray_GET_SIZE(self),
@@ -619,7 +619,7 @@ bytearray_ass_subscript(PyByteArrayObject *self, PyObject *index, PyObject *valu
         }
     }
     else if (PySlice_Check(index)) {
-        if (_PySlice_Unpack((PySliceObject *)index, &start, &stop, &step) < 0) {
+        if (_PySlice_Unpack(index, &start, &stop, &step) < 0) {
             return -1;
         }
         slicelen = _PySlice_AdjustIndices(PyByteArray_GET_SIZE(self), &start,

diff --git a/Objects/listobject.c b/Objects/listobject.c
index 24bb5bbd14a789a74cdac6bd305060e301d38fb2..bb65e98714eea16e6094b71b2d94eb724d34fc1d 100644 (file)
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -2562,7 +2562,7 @@ list_subscript(PyListObject* self, PyObject* item)
         PyObject* it;
         PyObject **src, **dest;
 
-        if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
+        if (_PySlice_Unpack(item, &start, &stop, &step) < 0) {
             return NULL;
         }
         slicelength = _PySlice_AdjustIndices(Py_SIZE(self), &start, &stop,
@@ -2612,7 +2612,7 @@ list_ass_subscript(PyListObject* self, PyObject* item, PyObject* value)
     else if (PySlice_Check(item)) {
         Py_ssize_t start, stop, step, slicelength;
 
-        if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
+        if (_PySlice_Unpack(item, &start, &stop, &step) < 0) {
             return -1;
         }
         slicelength = _PySlice_AdjustIndices(Py_SIZE(self), &start, &stop,

diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
index 12be12b00af53f9eef3eacdc329863cb086ab8f3..6fcd995a83d22fab83dfdf1d626010b1ac360911 100644 (file)
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -584,7 +584,7 @@ memory_subscript(PyMemoryViewObject *self, PyObject *key)
     else if (PySlice_Check(key)) {
         Py_ssize_t start, stop, step, slicelength;
 
-        if (_PySlice_Unpack((PySliceObject *)key, &start, &stop, &step) < 0) {
+        if (_PySlice_Unpack(key, &start, &stop, &step) < 0) {
             return NULL;
         }
         slicelength = _PySlice_AdjustIndices(get_shape0(view), &start, &stop,
@@ -663,7 +663,7 @@ memory_ass_sub(PyMemoryViewObject *self, PyObject *key, PyObject *value)
     else if (PySlice_Check(key)) {
         Py_ssize_t stop, step;
 
-        if (_PySlice_Unpack((PySliceObject *)key, &start, &stop, &step) < 0) {
+        if (_PySlice_Unpack(key, &start, &stop, &step) < 0) {
             return -1;
         }
         len = _PySlice_AdjustIndices(get_shape0(view), &start, &stop, step);

diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c
index 3ac3811853d2cfe3bbba9b5ac0c0d8e430e1bece..8f17fcacc81c7535242b728547d836cc87ba131e 100644 (file)
--- a/Objects/sliceobject.c
+++ b/Objects/sliceobject.c
@@ -286,7 +286,7 @@ static PyMemberDef slice_members[] = {
 static PyObject*
 slice_indices(PySliceObject* self, PyObject* len)
 {
-    Py_ssize_t ilen, start, stop, step, slicelength;
+    Py_ssize_t ilen, start, stop, step;
 
     ilen = PyNumber_AsSsize_t(len, PyExc_OverflowError);
 
@@ -294,10 +294,10 @@ slice_indices(PySliceObject* self, PyObject* len)
         return NULL;
     }
 
-    if (_PySlice_Unpack(self, &start, &stop, &step) < 0) {
+    if (_PySlice_Unpack((PyObject *)self, &start, &stop, &step) < 0) {
         return NULL;
     }
-    slicelength = _PySlice_AdjustIndices(ilen, &start, &stop, step);
+    _PySlice_AdjustIndices(ilen, &start, &stop, step);
 
     return Py_BuildValue("(nnn)", start, stop, step);
 }

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index ef4f8c1e19e4dfddea5d515b83f1cd1167905936..c78e19316a06ac507005e0a8a0af64a58666bcc2 100644 (file)
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -1310,7 +1310,7 @@ string_subscript(PyStringObject* self, PyObject* item)
         char* result_buf;
         PyObject* result;
 
-        if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
+        if (_PySlice_Unpack(item, &start, &stop, &step) < 0) {
             return NULL;
         }
         slicelength = _PySlice_AdjustIndices(PyString_GET_SIZE(self), &start,

diff --git a/Objects/structseq.c b/Objects/structseq.c
index 9b3ba48a8868543427ebf731526451dd7dc7dc85..3e45840fb742351e83676e095245b9a018120b82 100644 (file)
--- a/Objects/structseq.c
+++ b/Objects/structseq.c
@@ -114,7 +114,7 @@ structseq_subscript(PyStructSequence *self, PyObject *item)
         Py_ssize_t start, stop, step, slicelen, cur, i;
         PyObject *result;
 
-        if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
+        if (_PySlice_Unpack(item, &start, &stop, &step) < 0) {
             return NULL;
         }
         slicelen = _PySlice_AdjustIndices(VISIBLE_SIZE(self), &start, &stop,

diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index 808156f7148f23804b2856e462c7a0af1dd6872c..a61c8aa013b4c80d569e6807c85006e77c110859 100644 (file)
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -715,7 +715,7 @@ tuplesubscript(PyTupleObject* self, PyObject* item)
         PyObject* it;
         PyObject **src, **dest;
 
-        if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
+        if (_PySlice_Unpack(item, &start, &stop, &step) < 0) {
             return NULL;
         }
         slicelength = _PySlice_AdjustIndices(PyTuple_GET_SIZE(self), &start,

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 689529ad8b2b0c53404329fc3685c0e125c0a3e1..d011f7d50c2b13e18e74f5862373496c61324a6e 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -8008,7 +8008,7 @@ unicode_subscript(PyUnicodeObject* self, PyObject* item)
         Py_UNICODE* result_buf;
         PyObject* result;
 
-        if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
+        if (_PySlice_Unpack(item, &start, &stop, &step) < 0) {
             return NULL;
         }
         slicelength = _PySlice_AdjustIndices(PyUnicode_GET_SIZE(self), &start,