mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-10 08:53:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

make_pair(): When comparing the pointers, they must be cast to integer

Browse source 
types (i.e. Py_uintptr_t, our spelling of C9X's uintptr_t).  ANSI
specifies that pointer compares other than == and != to non-related
structures are undefined.  This quiets an Insure portability warning.
This commit is contained in:
Barry Warsaw 2000-08-18 05:01:19 +00:00
parent 67c1a04bbb
commit 9d23a4eb03
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Objects/object.c
View file

@ -371,12 +371,14 @@ static PyObject *
make_pair(PyObject *v, PyObject *w) make_pair(PyObject *v, PyObject *w)
{ {
PyObject *pair; PyObject *pair;
Py_uintptr_t iv = (Py_uintptr_t)v;
Py_uintptr_t iw = (Py_uintptr_t)w;
pair = PyTuple_New(2); pair = PyTuple_New(2);
if (pair == NULL) { if (pair == NULL) {
return NULL; return NULL;
} }
if (v <= w) { if (iv <= iw) {
PyTuple_SET_ITEM(pair, 0, PyLong_FromVoidPtr((void *)v)); PyTuple_SET_ITEM(pair, 0, PyLong_FromVoidPtr((void *)v));
PyTuple_SET_ITEM(pair, 1, PyLong_FromVoidPtr((void *)w)); PyTuple_SET_ITEM(pair, 1, PyLong_FromVoidPtr((void *)w));
} else { } else {
@ -487,7 +489,9 @@ PyObject_Compare(PyObject *v, PyObject *w)
return strcmp(vname, wname); return strcmp(vname, wname);
} }
if (vtp->tp_compare == NULL) { if (vtp->tp_compare == NULL) {
return (v < w) ? -1 : 1; Py_uintptr_t iv = (Py_uintptr_t)v;
Py_uintptr_t iw = (Py_uintptr_t)w;
return (iv < iw) ? -1 : 1;
} }
_PyCompareState_nesting++; _PyCompareState_nesting++;
if (_PyCompareState_nesting > NESTING_LIMIT if (_PyCompareState_nesting > NESTING_LIMIT