mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 08:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Use Py_CLEAR instead of in-place DECREF/XDECREF or custom macros, for

Browse source 
tp_clear methods.
This commit is contained in:
Thomas Wouters 2006-04-15 17:28:34 +00:00
parent ed8f783126
commit edf17d8798
8 changed files with 30 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Modules/_csv.c
View file

@ -828,12 +828,9 @@ Reader_traverse(ReaderObj *self, visitproc visit, void *arg)
static int
Reader_clear(ReaderObj *self)
{
Py_XDECREF(self->dialect);
Py_XDECREF(self->input_iter);
Py_XDECREF(self->fields);
self->dialect = NULL;
self->input_iter = NULL;
self->fields = NULL;
Py_CLEAR(self->dialect);
Py_CLEAR(self->input_iter);
Py_CLEAR(self->fields);
return 0;
}
@ -1260,10 +1257,8 @@ Writer_traverse(WriterObj *self, visitproc visit, void *arg)
static int
Writer_clear(WriterObj *self)
{
Py_XDECREF(self->dialect);
Py_XDECREF(self->writeline);
self->dialect = NULL;
self->writeline = NULL;
Py_CLEAR(self->dialect);
Py_CLEAR(self->writeline);
return 0;
}

38
Modules/cPickle.c
View file

@ -2931,16 +2931,14 @@ Pickler_traverse(Picklerobject *self, visitproc visit, void *arg)
static int
Pickler_clear(Picklerobject *self)
{
#define CLEAR(SLOT) Py_XDECREF(SLOT); SLOT = NULL;
CLEAR(self->write);
CLEAR(self->memo);
CLEAR(self->fast_memo);
CLEAR(self->arg);
CLEAR(self->file);
CLEAR(self->pers_func);
CLEAR(self->inst_pers_func);
CLEAR(self->dispatch_table);
#undef CLEAR
Py_CLEAR(self->write);
Py_CLEAR(self->memo);
Py_CLEAR(self->fast_memo);
Py_CLEAR(self->arg);
Py_CLEAR(self->file);
Py_CLEAR(self->pers_func);
Py_CLEAR(self->inst_pers_func);
Py_CLEAR(self->dispatch_table);
return 0;
}
@ -5284,17 +5282,15 @@ Unpickler_traverse(Unpicklerobject *self, visitproc visit, void *arg)
static int
Unpickler_clear(Unpicklerobject *self)
{
#define CLEAR(SLOT) Py_XDECREF(SLOT); SLOT = NULL
CLEAR(self->readline);
CLEAR(self->read);
CLEAR(self->file);
CLEAR(self->memo);
CLEAR(self->stack);
CLEAR(self->pers_func);
CLEAR(self->arg);
CLEAR(self->last_string);
CLEAR(self->find_class);
#undef CLEAR
Py_CLEAR(self->readline);
Py_CLEAR(self->read);
Py_CLEAR(self->file);
Py_CLEAR(self->memo);
Py_CLEAR(self->stack);
Py_CLEAR(self->pers_func);
Py_CLEAR(self->arg);
Py_CLEAR(self->last_string);
Py_CLEAR(self->find_class);
return 0;
}

5
Modules/collectionsmodule.c
View file

@ -1236,10 +1236,7 @@ defdict_traverse(PyObject *self, visitproc visit, void *arg)
static int
defdict_tp_clear(defdictobject *dd)
{
if (dd->default_factory != NULL) {
Py_DECREF(dd->default_factory);
dd->default_factory = NULL;
}
Py_CLEAR(dd->default_factory);
return PyDict_Type.tp_clear((PyObject *)dd);
}

3
Modules/pyexpat.c
View file

@ -1669,8 +1669,7 @@ static int
xmlparse_clear(xmlparseobject *op)
{
clear_handlers(op, 0);
Py_XDECREF(op->intern);
op->intern = 0;
Py_CLEAR(op->intern);
return 0;
}
#endif