[Python-checkins] python/dist/src/Objects stringobject.c,2.154,2.155

[nascheme@sourceforge.net]

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

Modified Files:
	stringobject.c 
Log Message:
Remove PyMalloc_New, _PyMalloc_MALLOC, and PyMalloc_Del.


Index: stringobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.154
retrieving revision 2.155
diff -C2 -d -r2.154 -r2.155
*** stringobject.c	3 Apr 2002 22:41:51 -0000	2.154
--- stringobject.c	12 Apr 2002 03:05:19 -0000	2.155
***************
*** 65,69 ****
  	/* PyObject_NewVar is inlined */
  	op = (PyStringObject *)
! 		_PyMalloc_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
  	if (op == NULL)
  		return PyErr_NoMemory();
--- 65,69 ----
  	/* PyObject_NewVar is inlined */
  	op = (PyStringObject *)
! 		PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
  	if (op == NULL)
  		return PyErr_NoMemory();
***************
*** 121,125 ****
  	/* PyObject_NewVar is inlined */
  	op = (PyStringObject *)
! 		_PyMalloc_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
  	if (op == NULL)
  		return PyErr_NoMemory();
--- 121,125 ----
  	/* PyObject_NewVar is inlined */
  	op = (PyStringObject *)
! 		PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
  	if (op == NULL)
  		return PyErr_NoMemory();
***************
*** 718,722 ****
  	/* PyObject_NewVar is inlined */
  	op = (PyStringObject *)
! 		_PyMalloc_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
  	if (op == NULL)
  		return PyErr_NoMemory();
--- 718,722 ----
  	/* PyObject_NewVar is inlined */
  	op = (PyStringObject *)
! 		PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
  	if (op == NULL)
  		return PyErr_NoMemory();
***************
*** 761,765 ****
  	}
  	op = (PyStringObject *)
! 		_PyMalloc_MALLOC(sizeof(PyStringObject) + nbytes);
  	if (op == NULL)
  		return PyErr_NoMemory();
--- 761,765 ----
  	}
  	op = (PyStringObject *)
! 		PyObject_MALLOC(sizeof(PyStringObject) + nbytes);
  	if (op == NULL)
  		return PyErr_NoMemory();
***************
*** 2756,2760 ****
  	0,					/* tp_alloc */
  	string_new,				/* tp_new */
! 	_PyMalloc_Del,				/* tp_free */
  };
  
--- 2756,2760 ----
  	0,					/* tp_alloc */
  	string_new,				/* tp_new */
! 	PyObject_Del,	                	/* tp_free */
  };
  
***************
*** 2808,2815 ****
  	_Py_ForgetReference(v);
  	*pv = (PyObject *)
! 		_PyMalloc_REALLOC((char *)v,
  			sizeof(PyStringObject) + newsize * sizeof(char));
  	if (*pv == NULL) {
! 		PyMalloc_Del(v);
  		PyErr_NoMemory();
  		return -1;
--- 2808,2815 ----
  	_Py_ForgetReference(v);
  	*pv = (PyObject *)
! 		PyObject_REALLOC((char *)v,
  			sizeof(PyStringObject) + newsize * sizeof(char));
  	if (*pv == NULL) {
! 		PyObject_Del(v);
  		PyErr_NoMemory();
  		return -1;