Remove PyMalloc_New and PyMalloc_Del.

nascheme · nascheme · commit 91f6c6912d74 · 2002-04-12T03:05:37.000Z
git-svn-id: http://svn.python.org/projects/python/trunk@26339 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c
@@ -60,7 +60,7 @@ PyObject _Py_EllipsisObject = {
 PyObject *
 PySlice_New(PyObject *start, PyObject *stop, PyObject *step)
 {
-	PySliceObject *obj = PyMalloc_New(PySliceObject, &PySlice_Type);
+	PySliceObject *obj = PyObject_New(PySliceObject, &PySlice_Type);
 
 	if (obj == NULL)
 		return NULL;
@@ -115,7 +115,7 @@ slice_dealloc(PySliceObject *r)
 	Py_DECREF(r->step);
 	Py_DECREF(r->start);
 	Py_DECREF(r->stop);
-	PyMalloc_Del(r);
+	PyObject_Del(r);
 }
 
 static PyObject *
diff --git a/Objects/structseq.c b/Objects/structseq.c
@@ -22,7 +22,7 @@ PyStructSequence_New(PyTypeObject *type)
 {
 	PyStructSequence *obj;
        
-	obj = PyMalloc_New(PyStructSequence, type);
+	obj = PyObject_New(PyStructSequence, type);
 	obj->ob_size = VISIBLE_SIZE_TP(type);
 
 	return (PyObject*) obj;
@@ -37,7 +37,7 @@ structseq_dealloc(PyStructSequence *obj)
 	for (i = 0; i < size; ++i) {
 		Py_XDECREF(obj->ob_item[i]);
 	}
-	PyMalloc_Del(obj);
+	PyObject_Del(obj);
 }
 
 static int

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ PyStructSequence_New(PyTypeObject *type)`
`22`	`22`	`{`
`23`	`23`	`PyStructSequence *obj;`
`24`	`24`
`25`		`- obj = PyMalloc_New(PyStructSequence, type);`
	`25`	`+ obj = PyObject_New(PyStructSequence, type);`
`26`	`26`	`obj->ob_size = VISIBLE_SIZE_TP(type);`
`27`	`27`
`28`	`28`	`return (PyObject*) obj;`
`@@ -37,7 +37,7 @@ structseq_dealloc(PyStructSequence *obj)`
`37`	`37`	`for (i = 0; i < size; ++i) {`
`38`	`38`	`Py_XDECREF(obj->ob_item[i]);`
`39`	`39`	`}`
`40`		`- PyMalloc_Del(obj);`
	`40`	`+ PyObject_Del(obj);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`static int`