The return value from PyObject_ClearWeakRefs() is no longer meaningful,

freddrake · freddrake · commit b60654bc1559 · 2001-02-26T18:56:37.000Z
so make it void.
diff --git a/Include/object.h b/Include/object.h
@@ -284,7 +284,7 @@ extern DL_IMPORT(int) PyCallable_Check(PyObject *);
 extern DL_IMPORT(int) PyNumber_Coerce(PyObject **, PyObject **);
 extern DL_IMPORT(int) PyNumber_CoerceEx(PyObject **, PyObject **);
 
-extern DL_IMPORT(int) (*PyObject_ClearWeakRefs)(PyObject *);
+extern DL_IMPORT(void) (*PyObject_ClearWeakRefs)(PyObject *);
 
 /* Helpers for printing recursive container types */
 extern DL_IMPORT(int) Py_ReprEnter(PyObject *);
diff --git a/Modules/_weakref.c b/Modules/_weakref.c
@@ -692,7 +692,7 @@ weakref_proxy(PyObject *self, PyObject *args)
  * until one resurrects the object, at which point it stops invalidating
  * weak references and returns false.
  */
-static int
+static
 cleanup_helper(PyObject *object)
 {
     PyWeakReference **list;
@@ -702,7 +702,7 @@ cleanup_helper(PyObject *object)
         || object->ob_refcnt != 0) {
         PyErr_BadInternalCall();
         /* not sure what we should return here */
-        return 1;
+        return;
     }
     list = GET_WEAKREFS_LISTPTR(object);
     while (*list != NULL) {
@@ -722,7 +722,7 @@ cleanup_helper(PyObject *object)
             Py_DECREF(callback);
         }
     }
-    return (object->ob_refcnt > 0 ? 0 : 1);
+    return;
 }
 
 
diff --git a/Objects/classobject.c b/Objects/classobject.c
@@ -516,8 +516,7 @@ instance_dealloc(register PyInstanceObject *inst)
 	extern long _Py_RefTotal;
 #endif
 
-	if (!PyObject_ClearWeakRefs((PyObject *) inst))
-		return;
+	PyObject_ClearWeakRefs((PyObject *) inst);
 
 	/* Temporarily resurrect the object. */
 #ifdef Py_TRACE_REFS
diff --git a/Objects/object.c b/Objects/object.c
@@ -1475,13 +1475,13 @@ PyObject_Free(void *p)
    call site instead of requiring a test for NULL.
 */
 
-static int
+static void
 empty_clear_weak_refs(PyObject *o)
 {
-    return 1;
+    return;
 }
 
-int (*PyObject_ClearWeakRefs)(PyObject *) = empty_clear_weak_refs;
+void (*PyObject_ClearWeakRefs)(PyObject *) = empty_clear_weak_refs;
 
 
 

Original file line number	Diff line number	Diff line change
`@@ -692,7 +692,7 @@ weakref_proxy(PyObject self, PyObject args)`
`692`	`692`	`* until one resurrects the object, at which point it stops invalidating`
`693`	`693`	`* weak references and returns false.`
`694`	`694`	`*/`
`695`		`-static int`
	`695`	`+static`
`696`	`696`	`cleanup_helper(PyObject *object)`
`697`	`697`	`{`
`698`	`698`	`PyWeakReference **list;`
`@@ -702,7 +702,7 @@ cleanup_helper(PyObject *object)`
`702`	`702`	`\|\| object->ob_refcnt != 0) {`
`703`	`703`	`PyErr_BadInternalCall();`
`704`	`704`	`/* not sure what we should return here */`
`705`		`- return 1;`
	`705`	`+ return;`
`706`	`706`	`}`
`707`	`707`	`list = GET_WEAKREFS_LISTPTR(object);`
`708`	`708`	`while (*list != NULL) {`
`@@ -722,7 +722,7 @@ cleanup_helper(PyObject *object)`
`722`	`722`	`Py_DECREF(callback);`
`723`	`723`	`}`
`724`	`724`	`}`
`725`		`- return (object->ob_refcnt > 0 ? 0 : 1);`
	`725`	`+ return;`
`726`	`726`	`}`
`727`	`727`
`728`	`728`
Original file line number	Diff line number	Diff line change
`@@ -1475,13 +1475,13 @@ PyObject_Free(void *p)`
`1475`	`1475`	`call site instead of requiring a test for NULL.`
`1476`	`1476`	`*/`
`1477`	`1477`
`1478`		`-static int`
	`1478`	`+static void`
`1479`	`1479`	`empty_clear_weak_refs(PyObject *o)`
`1480`	`1480`	`{`
`1481`		`- return 1;`
	`1481`	`+ return;`
`1482`	`1482`	`}`
`1483`	`1483`
`1484`		`-int (PyObject_ClearWeakRefs)(PyObject ) = empty_clear_weak_refs;`
	`1484`	`+void (PyObject_ClearWeakRefs)(PyObject ) = empty_clear_weak_refs;`
`1485`	`1485`
`1486`	`1486`
`1487`	`1487`