diff options
| author | Neil Schemenauer <nascheme@enme.ucalgary.ca> | 2002-03-22 15:33:15 (GMT) |
|---|---|---|
| committer | Neil Schemenauer <nascheme@enme.ucalgary.ca> | 2002-03-22 15:33:15 (GMT) |
| commit | dcc819a5c9e3cb60eba05a3c0b2547bc1fb28b80 (patch) | |
| tree | 124d72d29df550ba35d3a4b6ba66232619c85ee1 /Objects/stringobject.c | |
| parent | a1a9c51a3ef06614413f45d51e65588bcd0793f2 (diff) | |
| download | cpython-dcc819a5c9e3cb60eba05a3c0b2547bc1fb28b80.zip cpython-dcc819a5c9e3cb60eba05a3c0b2547bc1fb28b80.tar.gz cpython-dcc819a5c9e3cb60eba05a3c0b2547bc1fb28b80.tar.bz2 | |
Use pymalloc if it's enabled.
Diffstat (limited to 'Objects/stringobject.c')
| -rw-r--r-- | Objects/stringobject.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 4fb5e93..b39d9e5 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -68,7 +68,7 @@ PyString_FromStringAndSize(const char *str, int size) /* PyObject_NewVar is inlined */ op = (PyStringObject *) - PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char)); + _PyMalloc_MALLOC(sizeof(PyStringObject) + size * sizeof(char)); if (op == NULL) return PyErr_NoMemory(); PyObject_INIT_VAR(op, &PyString_Type, size); @@ -131,7 +131,7 @@ PyString_FromString(const char *str) /* PyObject_NewVar is inlined */ op = (PyStringObject *) - PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char)); + _PyMalloc_MALLOC(sizeof(PyStringObject) + size * sizeof(char)); if (op == NULL) return PyErr_NoMemory(); PyObject_INIT_VAR(op, &PyString_Type, size); @@ -733,7 +733,7 @@ string_concat(register PyStringObject *a, register PyObject *bb) size = a->ob_size + b->ob_size; /* PyObject_NewVar is inlined */ op = (PyStringObject *) - PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char)); + _PyMalloc_MALLOC(sizeof(PyStringObject) + size * sizeof(char)); if (op == NULL) return PyErr_NoMemory(); PyObject_INIT_VAR(op, &PyString_Type, size); @@ -780,7 +780,7 @@ string_repeat(register PyStringObject *a, register int n) return NULL; } op = (PyStringObject *) - PyObject_MALLOC(sizeof(PyStringObject) + nbytes); + _PyMalloc_MALLOC(sizeof(PyStringObject) + nbytes); if (op == NULL) return PyErr_NoMemory(); PyObject_INIT_VAR(op, &PyString_Type, size); @@ -2789,7 +2789,7 @@ PyTypeObject PyString_Type = { 0, /* tp_init */ 0, /* tp_alloc */ string_new, /* tp_new */ - _PyObject_Del, /* tp_free */ + _PyMalloc_Del, /* tp_free */ }; void @@ -2841,10 +2841,10 @@ _PyString_Resize(PyObject **pv, int newsize) #endif _Py_ForgetReference(v); *pv = (PyObject *) - PyObject_REALLOC((char *)v, + _PyMalloc_REALLOC((char *)v, sizeof(PyStringObject) + newsize * sizeof(char)); if (*pv == NULL) { - PyObject_DEL(v); + PyMalloc_Del(v); PyErr_NoMemory(); return -1; } |