From: Neil Schemenauer <nascheme@enme.ucalgary.ca>
Date: Fri, 12 Apr 2002 03:07:20 +0000 (+0000)
Subject: Remove PyMalloc_*.
X-Git-Tag: v2.3c1~6021
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58aa861fa2cb77abbafa3f7f2f16e8dd5ce02f9d;p=thirdparty%2FPython%2Fcpython.git

Remove PyMalloc_*.
---

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