Always user Zend memory allocation wrappers.

This commit is contained in:
Ilia Alshanetsky 2003-12-17 16:34:10 +00:00
parent ae4a09b239
commit 664268b037

View file

@ -156,7 +156,6 @@ zend_module_entry tidy_module_entry = {
ZEND_GET_MODULE(tidy) ZEND_GET_MODULE(tidy)
#endif #endif
#if MEMORY_LIMIT
void *php_tidy_malloc(size_t len) void *php_tidy_malloc(size_t len)
{ {
return emalloc(len); return emalloc(len);
@ -171,7 +170,7 @@ void php_tidy_free(void *buf)
{ {
efree(buf); efree(buf);
} }
#endif
void php_tidy_panic(ctmbstr msg) void php_tidy_panic(ctmbstr msg)
{ {
zend_error(E_ERROR, "Could not allocate memory for tidy! (Reason: %s)", (char *)msg); zend_error(E_ERROR, "Could not allocate memory for tidy! (Reason: %s)", (char *)msg);
@ -297,11 +296,9 @@ static void tidy_object_new(zend_class_entry *class_type, zend_object_handlers *
break; break;
case is_doc: case is_doc:
#if MEMORY_LIMIT
tidySetMallocCall(php_tidy_malloc); tidySetMallocCall(php_tidy_malloc);
tidySetReallocCall(php_tidy_realloc); tidySetReallocCall(php_tidy_realloc);
tidySetFreeCall(php_tidy_free); tidySetFreeCall(php_tidy_free);
#endif
tidySetPanicCall(php_tidy_panic); tidySetPanicCall(php_tidy_panic);
intern->ptdoc = emalloc(sizeof(PHPTidyDoc)); intern->ptdoc = emalloc(sizeof(PHPTidyDoc));