MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed from using Py_XDECREF to Py_CLEAR

develop
doomchild 2010-04-06 16:23:49 -05:00
parent aaa6c711ad
commit a48fd26327
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dfhack/python/DF_API.cpp
Unescape Escape View File

@ -85,6 +85,10 @@ static void DF_API_dealloc(DF_API* self)
{ {
if(self != NULL) if(self != NULL)
{ {
Py_CLEAR(self->mem_info);
Py_CLEAR(self->position);
Py_CLEAR(self->material);
if(self->api_Ptr != NULL) if(self->api_Ptr != NULL)
{ {
delete self->api_Ptr; delete self->api_Ptr;
@ -92,10 +96,6 @@ static void DF_API_dealloc(DF_API* self)
self->api_Ptr = NULL; self->api_Ptr = NULL;
} }
Py_XDECREF(self->mem_info);
Py_XDECREF(self->position);
Py_XDECREF(self->material);
self->ob_type->tp_free((PyObject*)self); self->ob_type->tp_free((PyObject*)self);
} }
} }
@ -145,7 +145,7 @@ static PyObject* DF_API_getMemoryInfo(DF_API* self, void* closure)
{ {
if(self->api_Ptr != NULL) if(self->api_Ptr != NULL)
{ {
self->mem_info = _PyObject_New(&DF_MemInfo_type); self->mem_info = PyObject_Call((PyObject*)&DF_MemInfo_type, NULL, NULL);
if(self->mem_info != NULL) if(self->mem_info != NULL)
{ {
@ -174,7 +174,7 @@ static PyObject* DF_API_getPosition(DF_API* self, void* closure)
{ {
if(self->api_Ptr != NULL) if(self->api_Ptr != NULL)
{ {
self->position = _PyObject_New(&DF_Position_type); self->position = PyObject_Call((PyObject*)&DF_Position_type, NULL, NULL);
if(self->position != NULL) if(self->position != NULL)
{ {
@ -203,7 +203,7 @@ static PyObject* DF_API_getMaterial(DF_API* self, void* closure)
{ {
if(self->api_Ptr != NULL) if(self->api_Ptr != NULL)
{ {
self->material = _PyObject_New(&DF_Material_type); self->material = PyObject_Call((PyObject*)&DF_Material_type, NULL, NULL);
if(self->material != NULL) if(self->material != NULL)
{ {