diff options
| author | Guido van Rossum <guido@python.org> | 2006-08-24 23:43:52 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2006-08-24 23:43:52 (GMT) |
| commit | f1624cd2d640949de2af6e6cd6ab75c1d95fe3a3 (patch) | |
| tree | e177a792da047d8bc95746113ae4c4fc66c6a068 /Objects | |
| parent | dc5f6b232be9f669f78d627cdcacc07d2ba167af (diff) | |
| download | cpython-f1624cd2d640949de2af6e6cd6ab75c1d95fe3a3.zip cpython-f1624cd2d640949de2af6e6cd6ab75c1d95fe3a3.tar.gz cpython-f1624cd2d640949de2af6e6cd6ab75c1d95fe3a3.tar.bz2 | |
Fix a bunch of compiler warnings. In at least one case these were serious bugs!
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/codeobject.c | 14 | ||||
| -rw-r--r-- | Objects/listobject.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Objects/codeobject.c b/Objects/codeobject.c index e9b853c..ca156e8 100644 --- a/Objects/codeobject.c +++ b/Objects/codeobject.c @@ -308,7 +308,7 @@ code_richcompare(PyObject *self, PyObject *other, int op) co = (PyCodeObject *)self; 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; eq = co->co_argcount == cp->co_argcount; if (!eq) goto unequal; @@ -318,17 +318,17 @@ code_richcompare(PyObject *self, PyObject *other, int op) if (!eq) goto unequal; eq = co->co_firstlineno == cp->co_firstlineno; 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; - 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; - 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; - 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; - 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; - 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 (op == Py_EQ) diff --git a/Objects/listobject.c b/Objects/listobject.c index 3d81656..9a11680 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -1979,7 +1979,7 @@ is_default_cmp(PyObject *cmpfunc) return 1; if (!PyCFunction_Check(cmpfunc)) return 0; - f = (PyCFunction *)cmpfunc; + f = (PyCFunctionObject *)cmpfunc; if (f->m_self != NULL) return 0; if (!PyString_Check(f->m_module)) |