Mailing List Archive

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv18828/Objects

Modified Files:
unicodeobject.c
Log Message:
Remove PyMalloc_*.


Index: unicodeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v
retrieving revision 2.136
retrieving revision 2.137
diff -C2 -d -r2.136 -r2.137
*** unicodeobject.c 10 Apr 2002 20:36:13 -0000 2.136
--- unicodeobject.c 12 Apr 2002 03:07:20 -0000 2.137
***************
*** 202,206 ****
}
else {
! unicode = PyMalloc_New(PyUnicodeObject, &PyUnicode_Type);
if (unicode == NULL)
return NULL;
--- 202,206 ----
}
else {
! unicode = PyObject_New(PyUnicodeObject, &PyUnicode_Type);
if (unicode == NULL)
return NULL;
***************
*** 220,224 ****
onError:
_Py_ForgetReference((PyObject *)unicode);
! PyMalloc_Del(unicode);
return NULL;
}
--- 220,224 ----
onError:
_Py_ForgetReference((PyObject *)unicode);
! PyObject_Del(unicode);
return NULL;
}
***************
*** 5719,5723 ****
if (pnew->str == NULL) {
_Py_ForgetReference((PyObject *)pnew);
! PyMalloc_Del(pnew);
return NULL;
}
--- 5719,5723 ----
if (pnew->str == NULL) {
_Py_ForgetReference((PyObject *)pnew);
! PyObject_Del(pnew);
return NULL;
}
***************
*** 5777,5781 ****
0, /* tp_alloc */
unicode_new, /* tp_new */
! _PyMalloc_Del, /* tp_free */
};

--- 5777,5781 ----
0, /* tp_alloc */
unicode_new, /* tp_new */
! PyObject_Del, /* tp_free */
};

***************
*** 5819,5823 ****
PyMem_DEL(v->str);
Py_XDECREF(v->defenc);
! PyMalloc_Del(v);
}
unicode_freelist = NULL;
--- 5819,5823 ----
PyMem_DEL(v->str);
Py_XDECREF(v->defenc);
! PyObject_Del(v);
}
unicode_freelist = NULL;