From: Guido van Rossum <guido@python.org>
Date: Thu, 24 Aug 2006 23:43:52 +0000 (+0000)
Subject: Fix a bunch of compiler warnings.  In at least one case these were serious bugs!
X-Git-Tag: v3.0a1~1343
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1624cd2d640949de2af6e6cd6ab75c1d95fe3a3;p=python

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

diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index e9b853c7c7..ca156e8319 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 3d81656930..9a11680fda 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))