mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-09 18:32:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Remove "referents" structure (it's not needed). Check return value

Browse source 
of PyList_Append.
This commit is contained in:
Neil Schemenauer 2001-08-10 14:46:47 +00:00
parent a8b5f7d178
commit 17e7be60b4
1 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Modules/gcmodule.c
View file

@ -677,38 +677,32 @@ gc_get_thresh(PyObject *self, PyObject *args)
return Py_BuildValue("(iii)", threshold0, threshold1, threshold2); return Py_BuildValue("(iii)", threshold0, threshold1, threshold2);
} }
struct referents{
PyObject *objs;
int seen;
};
static int static int
referentsvisit(PyObject* obj, struct referents* refs) referentsvisit(PyObject* obj, PyObject *objs)
{ {
if (PySequence_Contains (refs->objs, obj)) { if (PySequence_Contains(objs, obj)) {
refs->seen = 1;
return 1; return 1;
} }
return 0; return 0;
} }
static void static int
gc_referents_for(PyObject *objs, PyGC_Head *list, PyObject *resultlist) gc_referents_for(PyObject *objs, PyGC_Head *list, PyObject *resultlist)
{ {
PyGC_Head *gc; PyGC_Head *gc;
PyObject *obj; PyObject *obj;
traverseproc traverse; traverseproc traverse;
struct referents refs = {objs, 0};
for (gc = list->gc_next; gc != list; gc = gc->gc_next) { for (gc = list->gc_next; gc != list; gc = gc->gc_next) {
obj = PyObject_FROM_GC(gc); obj = PyObject_FROM_GC(gc);
traverse = obj->ob_type->tp_traverse; traverse = obj->ob_type->tp_traverse;
if (obj == objs || obj == resultlist) if (obj == objs || obj == resultlist)
continue; continue;
if (traverse(obj, (visitproc)referentsvisit, &refs)) { if (traverse(obj, (visitproc)referentsvisit, objs)) {
PyList_Append(resultlist, obj); if (PyList_Append(resultlist, obj) < 0)
refs.seen = 0; return 0; /* error */
} }
} }
return 1; /* no error */
} }
static char gc_get_referents__doc__[]= static char gc_get_referents__doc__[]=
@ -719,9 +713,12 @@ static PyObject*
gc_get_referents(PyObject *self, PyObject *args) gc_get_referents(PyObject *self, PyObject *args)
{ {
PyObject *result = PyList_New(0); PyObject *result = PyList_New(0);
gc_referents_for(args, &generation0, result); if (!(gc_referents_for(args, &generation0, result) &&
gc_referents_for(args, &generation1, result); gc_referents_for(args, &generation1, result) &&
gc_referents_for(args, &generation2, result); gc_referents_for(args, &generation2, result))) {
Py_DECREF(result);
return NULL;
}
return result; return result;
} }