mirror of https://github.com/python/cpython
Rename dubiously named local variable 'cmpfunc' -- this is also a
typedef, and at least one compiler choked on this. (SF patch #103457, by bquinlan)
This commit is contained in:
parent
2b724da8d9
commit
3202c6fac8
|
@ -1409,7 +1409,7 @@ half_cmp(PyObject *v, PyObject *w)
|
|||
{
|
||||
static PyObject *cmp_obj;
|
||||
PyObject *args;
|
||||
PyObject *cmpfunc;
|
||||
PyObject *cmp_func;
|
||||
PyObject *result;
|
||||
long l;
|
||||
|
||||
|
@ -1421,8 +1421,8 @@ half_cmp(PyObject *v, PyObject *w)
|
|||
return -2;
|
||||
}
|
||||
|
||||
cmpfunc = PyObject_GetAttr(v, cmp_obj);
|
||||
if (cmpfunc == NULL) {
|
||||
cmp_func = PyObject_GetAttr(v, cmp_obj);
|
||||
if (cmp_func == NULL) {
|
||||
PyErr_Clear();
|
||||
return 2;
|
||||
}
|
||||
|
@ -1431,9 +1431,9 @@ half_cmp(PyObject *v, PyObject *w)
|
|||
if (args == NULL)
|
||||
return -2;
|
||||
|
||||
result = PyEval_CallObject(cmpfunc, args);
|
||||
result = PyEval_CallObject(cmp_func, args);
|
||||
Py_DECREF(args);
|
||||
Py_DECREF(cmpfunc);
|
||||
Py_DECREF(cmp_func);
|
||||
|
||||
if (result == NULL)
|
||||
return -2;
|
||||
|
|
Loading…
Reference in New Issue