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

Remove PyMalloc_*.

Browse source
This commit is contained in:
Neil Schemenauer 2002-04-12 03:07:20 +00:00
parent 09a2ae5882
commit 58aa861fa2
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Objects/unicodeobject.c
View file

@ -201,7 +201,7 @@ PyUnicodeObject *_PyUnicode_New(int length)
PyObject_INIT(unicode, &PyUnicode_Type); PyObject_INIT(unicode, &PyUnicode_Type);
} }
else { else {
unicode = PyMalloc_New(PyUnicodeObject, &PyUnicode_Type); unicode = PyObject_New(PyUnicodeObject, &PyUnicode_Type);
if (unicode == NULL) if (unicode == NULL)
return NULL; return NULL;
unicode->str = PyMem_NEW(Py_UNICODE, length + 1); unicode->str = PyMem_NEW(Py_UNICODE, length + 1);
@ -219,7 +219,7 @@ PyUnicodeObject *_PyUnicode_New(int length)
onError: onError:
_Py_ForgetReference((PyObject *)unicode); _Py_ForgetReference((PyObject *)unicode);
PyMalloc_Del(unicode); PyObject_Del(unicode);
return NULL; return NULL;
} }
@ -5718,7 +5718,7 @@ unicode_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
pnew->str = PyMem_NEW(Py_UNICODE, n+1); pnew->str = PyMem_NEW(Py_UNICODE, n+1);
if (pnew->str == NULL) { if (pnew->str == NULL) {
_Py_ForgetReference((PyObject *)pnew); _Py_ForgetReference((PyObject *)pnew);
PyMalloc_Del(pnew); PyObject_Del(pnew);
return NULL; return NULL;
} }
Py_UNICODE_COPY(pnew->str, tmp->str, n+1); Py_UNICODE_COPY(pnew->str, tmp->str, n+1);
@ -5776,7 +5776,7 @@ PyTypeObject PyUnicode_Type = {
0, /* tp_init */ 0, /* tp_init */
0, /* tp_alloc */ 0, /* tp_alloc */
unicode_new, /* tp_new */ unicode_new, /* tp_new */
_PyMalloc_Del, /* tp_free */ PyObject_Del, /* tp_free */
}; };
/* Initialize the Unicode implementation */ /* Initialize the Unicode implementation */
@ -5818,7 +5818,7 @@ _PyUnicode_Fini(void)
if (v->str) if (v->str)
PyMem_DEL(v->str); PyMem_DEL(v->str);
Py_XDECREF(v->defenc); Py_XDECREF(v->defenc);
PyMalloc_Del(v); PyObject_Del(v);
} }
unicode_freelist = NULL; unicode_freelist = NULL;
unicode_freelist_size = 0; unicode_freelist_size = 0;