Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 05:31:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix a bunch of compiler warnings. In at least one case these were serious bugs!

Browse source
This commit is contained in:
Guido van Rossum 2006-08-24 23:43:52 +00:00
parent dc5f6b232b
commit f1624cd2d6
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Objects/codeobject.c
View file

@ -308,7 +308,7 @@ code_richcompare(PyObject *self, PyObject *other, int op)
co = (PyCodeObject *)self; co = (PyCodeObject *)self;
cp = (PyCodeObject *)other; cp = (PyCodeObject *)other;
eq = PyObject_RichCompare(co->co_name, cp->co_name, Py_EQ); eq = PyObject_RichCompareBool(co->co_name, cp->co_name, Py_EQ);
if (eq <= 0) goto unequal; if (eq <= 0) goto unequal;
eq = co->co_argcount == cp->co_argcount; eq = co->co_argcount == cp->co_argcount;
if (!eq) goto unequal; if (!eq) goto unequal;
@ -318,17 +318,17 @@ code_richcompare(PyObject *self, PyObject *other, int op)
if (!eq) goto unequal; if (!eq) goto unequal;
eq = co->co_firstlineno == cp->co_firstlineno; eq = co->co_firstlineno == cp->co_firstlineno;
if (!eq) goto unequal; if (!eq) goto unequal;
eq = PyObject_RichCompare(co->co_code, cp->co_code, Py_EQ); eq = PyObject_RichCompareBool(co->co_code, cp->co_code, Py_EQ);
if (eq <= 0) goto unequal; if (eq <= 0) goto unequal;
eq = PyObject_RichCompare(co->co_consts, cp->co_consts, Py_EQ); eq = PyObject_RichCompareBool(co->co_consts, cp->co_consts, Py_EQ);
if (eq <= 0) goto unequal; if (eq <= 0) goto unequal;
eq = PyObject_RichCompare(co->co_names, cp->co_names, Py_EQ); eq = PyObject_RichCompareBool(co->co_names, cp->co_names, Py_EQ);
if (eq <= 0) goto unequal; if (eq <= 0) goto unequal;
eq = PyObject_RichCompare(co->co_varnames, cp->co_varnames, Py_EQ); eq = PyObject_RichCompareBool(co->co_varnames, cp->co_varnames, Py_EQ);
if (eq <= 0) goto unequal; if (eq <= 0) goto unequal;
eq = PyObject_RichCompare(co->co_freevars, cp->co_freevars, Py_EQ); eq = PyObject_RichCompareBool(co->co_freevars, cp->co_freevars, Py_EQ);
if (eq <= 0) goto unequal; if (eq <= 0) goto unequal;
eq = PyObject_RichCompare(co->co_cellvars, cp->co_cellvars, Py_EQ); eq = PyObject_RichCompareBool(co->co_cellvars, cp->co_cellvars, Py_EQ);
if (eq <= 0) goto unequal; if (eq <= 0) goto unequal;
if (op == Py_EQ) if (op == Py_EQ)

2
Objects/listobject.c
View file

@ -1979,7 +1979,7 @@ is_default_cmp(PyObject *cmpfunc)
return 1; return 1;
if (!PyCFunction_Check(cmpfunc)) if (!PyCFunction_Check(cmpfunc))
return 0; return 0;
f = (PyCFunction *)cmpfunc; f = (PyCFunctionObject *)cmpfunc;
if (f->m_self != NULL) if (f->m_self != NULL)
return 0; return 0;
if (!PyString_Check(f->m_module)) if (!PyString_Check(f->m_module))