mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
[3.13] gh-126862: Use Py_ssize_t
instead of int
when processing the number of super-classes (GH-127523) (#128699)
gh-126862: Use `Py_ssize_t` instead of `int` when processing the number of super-classes (GH-127523)
(cherry picked from commit 2fcdc8488c
)
Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
This commit is contained in:
parent
0d2b9abd18
commit
5370ad100d
2 changed files with 6 additions and 4 deletions
|
@ -2649,7 +2649,7 @@ vectorcall_maybe(PyThreadState *tstate, PyObject *name,
|
|||
*/
|
||||
|
||||
static int
|
||||
tail_contains(PyObject *tuple, int whence, PyObject *o)
|
||||
tail_contains(PyObject *tuple, Py_ssize_t whence, PyObject *o)
|
||||
{
|
||||
Py_ssize_t j, size;
|
||||
size = PyTuple_GET_SIZE(tuple);
|
||||
|
@ -2712,7 +2712,7 @@ check_duplicates(PyObject *tuple)
|
|||
*/
|
||||
|
||||
static void
|
||||
set_mro_error(PyObject **to_merge, Py_ssize_t to_merge_size, int *remain)
|
||||
set_mro_error(PyObject **to_merge, Py_ssize_t to_merge_size, Py_ssize_t *remain)
|
||||
{
|
||||
Py_ssize_t i, n, off;
|
||||
char buf[1000];
|
||||
|
@ -2767,13 +2767,13 @@ pmerge(PyObject *acc, PyObject **to_merge, Py_ssize_t to_merge_size)
|
|||
{
|
||||
int res = 0;
|
||||
Py_ssize_t i, j, empty_cnt;
|
||||
int *remain;
|
||||
Py_ssize_t *remain;
|
||||
|
||||
/* remain stores an index into each sublist of to_merge.
|
||||
remain[i] is the index of the next base in to_merge[i]
|
||||
that is not included in acc.
|
||||
*/
|
||||
remain = PyMem_New(int, to_merge_size);
|
||||
remain = PyMem_New(Py_ssize_t, to_merge_size);
|
||||
if (remain == NULL) {
|
||||
PyErr_NoMemory();
|
||||
return -1;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue