diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2004-04-23 17:51:39 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2004-04-23 17:51:39 +0000 |
| commit | 2d9549455d7c6c08e80341d8a9cce48e3cc536ac (patch) | |
| tree | d3f857518ac7ac9718a0402893808de4a1a2e4bc /ext/pcre/php_pcre.c | |
| parent | 7aa63c6209eccb7bbec729535cf0aba6cf2087f9 (diff) | |
| download | php-git-2d9549455d7c6c08e80341d8a9cce48e3cc536ac.tar.gz | |
bug #27810 from Joe Orton
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 68ea54b8e9..3bed679a01 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -47,20 +47,6 @@ ZEND_DECLARE_MODULE_GLOBALS(pcre) - -static void *php_pcre_malloc(size_t size) -{ - return pemalloc(size, 1); -} - - -static void php_pcre_free(void *ptr) -{ - if (ptr) - pefree(ptr, 1); -} - - static void php_free_pcre_cache(void *data) { pcre_cache_entry *pce = (pcre_cache_entry *) data; @@ -107,14 +93,6 @@ static PHP_MINIT_FUNCTION(pcre) REGISTER_LONG_CONSTANT("PREG_SPLIT_OFFSET_CAPTURE", PREG_SPLIT_OFFSET_CAPTURE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("PREG_GREP_INVERT", PREG_GREP_INVERT, CONST_CS | CONST_PERSISTENT); - pcre_malloc = php_pcre_malloc; - pcre_free = php_pcre_free; - -#ifdef NO_RECURSE - pcre_stack_malloc = php_pcre_malloc; - pcre_stack_free = php_pcre_free; -#endif - return SUCCESS; } /* }}} */ @@ -548,7 +526,7 @@ static void php_pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global) } } - php_pcre_free((void *) stringlist); + pcre_free((void *) stringlist); } } else { /* Failed to match */ |