Skip to content

Commit d5fdc06

Browse files
mdickinsonmdickinson
committed
Silence more 'comparison between signed and unsigned' warnings.
1 parent f0f6bd6 commit d5fdc06

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

‎Include/pymem.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ PyAPI_FUNC(void) PyMem_Free(void *);
9090
*/
9191

9292
#define PyMem_New(type, n) \
93-
( ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
93+
( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
9494
( (type *) PyMem_Malloc((n) * sizeof(type)) ) )
9595
#define PyMem_NEW(type, n) \
96-
( ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
96+
( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
9797
( (type *) PyMem_MALLOC((n) * sizeof(type)) ) )
9898

9999
/*
@@ -103,10 +103,10 @@ PyAPI_FUNC(void) PyMem_Free(void *);
103103
* caller's memory error handler to not lose track of it.
104104
*/
105105
#define PyMem_Resize(p, type, n) \
106-
( (p) = ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
106+
( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
107107
(type *) PyMem_Realloc((p), (n) * sizeof(type)) )
108108
#define PyMem_RESIZE(p, type, n) \
109-
( (p) = ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
109+
( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
110110
(type *) PyMem_REALLOC((p), (n) * sizeof(type)) )
111111

112112
/* PyMem{Del,DEL} are left over from ancient days, and shouldn't be used

‎Modules/arraymodule.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1804,14 +1804,14 @@ array_ass_subscr(arrayobject* self, PyObject* item, PyObject* value)
18041804
cur += step, i++) {
18051805
Py_ssize_t lim = step - 1;
18061806

1807-
if (cur + step >= Py_SIZE(self))
1807+
if (cur + step >= (size_t)Py_SIZE(self))
18081808
lim = Py_SIZE(self) - cur - 1;
18091809
memmove(self->ob_item + (cur - i) * itemsize,
18101810
self->ob_item + (cur + 1) * itemsize,
18111811
lim * itemsize);
18121812
}
18131813
cur = start + slicelength * step;
1814-
if (cur < Py_SIZE(self)) {
1814+
if (cur < (size_t)Py_SIZE(self)) {
18151815
memmove(self->ob_item + (cur-slicelength) * itemsize,
18161816
self->ob_item + cur * itemsize,
18171817
(Py_SIZE(self) - cur) * itemsize);

0 commit comments

Comments
 (0)