Skip to content

Commit 7d4ff84

Browse files
committed
Remove persistent allocators from libmbfl
These functions are not used, and I don't think we have any plans to ever use them.
1 parent 6086343 commit 7d4ff84

File tree

2 files changed

+0
-24
lines changed

2 files changed

+0
-24
lines changed

ext/mbstring/libmbfl/mbfl/mbfl_allocators.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ typedef struct _mbfl_allocators {
3939
void *(*realloc)(void *, size_t);
4040
void *(*calloc)(size_t, size_t);
4141
void (*free)(void *);
42-
void *(*pmalloc)(size_t);
43-
void *(*prealloc)(void *, size_t);
44-
void (*pfree)(void *);
4542
} mbfl_allocators;
4643

4744
MBFLAPI extern mbfl_allocators *__mbfl_allocators;
@@ -50,8 +47,5 @@ MBFLAPI extern mbfl_allocators *__mbfl_allocators;
5047
#define mbfl_realloc (__mbfl_allocators->realloc)
5148
#define mbfl_calloc (__mbfl_allocators->calloc)
5249
#define mbfl_free (__mbfl_allocators->free)
53-
#define mbfl_pmalloc (__mbfl_allocators->pmalloc)
54-
#define mbfl_prealloc (__mbfl_allocators->preallloc)
55-
#define mbfl_pfree (__mbfl_allocators->pfree)
5650

5751
#endif /* MBFL_ALLOCATORS_H */

ext/mbstring/mbstring.c

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -237,29 +237,11 @@ static void _php_mb_allocators_free(void *ptr)
237237
efree(ptr);
238238
}
239239

240-
static void *_php_mb_allocators_pmalloc(size_t sz)
241-
{
242-
return pemalloc(sz, 1);
243-
}
244-
245-
static void *_php_mb_allocators_prealloc(void *ptr, size_t sz)
246-
{
247-
return perealloc(ptr, sz, 1);
248-
}
249-
250-
static void _php_mb_allocators_pfree(void *ptr)
251-
{
252-
pefree(ptr, 1);
253-
}
254-
255240
static const mbfl_allocators _php_mb_allocators = {
256241
_php_mb_allocators_malloc,
257242
_php_mb_allocators_realloc,
258243
_php_mb_allocators_calloc,
259244
_php_mb_allocators_free,
260-
_php_mb_allocators_pmalloc,
261-
_php_mb_allocators_prealloc,
262-
_php_mb_allocators_pfree
263245
};
264246
/* }}} */
265247

0 commit comments

Comments
 (0)