diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-05-04 23:10:17 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-05-04 23:19:07 +0200 |
| commit | 7d4ff8443ecce572ad7d406cc1a3bbf74cadaf9b (patch) | |
| tree | f3a424f47a5249eae55829d86c93d085365a7c48 | |
| parent | 6086343a91b7167243d65463d24bbd5a2db7dec3 (diff) | |
| download | php-git-7d4ff8443ecce572ad7d406cc1a3bbf74cadaf9b.tar.gz | |
Remove persistent allocators from libmbfl
These functions are not used, and I don't think we have any plans
to ever use them.
| -rw-r--r-- | ext/mbstring/libmbfl/mbfl/mbfl_allocators.h | 6 | ||||
| -rw-r--r-- | ext/mbstring/mbstring.c | 18 |
2 files changed, 0 insertions, 24 deletions
diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h index 08fc275d04..5caf25097e 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h @@ -39,9 +39,6 @@ typedef struct _mbfl_allocators { void *(*realloc)(void *, size_t); void *(*calloc)(size_t, size_t); void (*free)(void *); - void *(*pmalloc)(size_t); - void *(*prealloc)(void *, size_t); - void (*pfree)(void *); } mbfl_allocators; MBFLAPI extern mbfl_allocators *__mbfl_allocators; @@ -50,8 +47,5 @@ MBFLAPI extern mbfl_allocators *__mbfl_allocators; #define mbfl_realloc (__mbfl_allocators->realloc) #define mbfl_calloc (__mbfl_allocators->calloc) #define mbfl_free (__mbfl_allocators->free) -#define mbfl_pmalloc (__mbfl_allocators->pmalloc) -#define mbfl_prealloc (__mbfl_allocators->preallloc) -#define mbfl_pfree (__mbfl_allocators->pfree) #endif /* MBFL_ALLOCATORS_H */ diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 652027f4c5..f636d51b02 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -237,29 +237,11 @@ static void _php_mb_allocators_free(void *ptr) efree(ptr); } -static void *_php_mb_allocators_pmalloc(size_t sz) -{ - return pemalloc(sz, 1); -} - -static void *_php_mb_allocators_prealloc(void *ptr, size_t sz) -{ - return perealloc(ptr, sz, 1); -} - -static void _php_mb_allocators_pfree(void *ptr) -{ - pefree(ptr, 1); -} - static const mbfl_allocators _php_mb_allocators = { _php_mb_allocators_malloc, _php_mb_allocators_realloc, _php_mb_allocators_calloc, _php_mb_allocators_free, - _php_mb_allocators_pmalloc, - _php_mb_allocators_prealloc, - _php_mb_allocators_pfree }; /* }}} */ |