@@ -1277,7 +1277,7 @@ static zend_never_inline void *zend_mm_alloc_small_slow(zend_mm_heap *heap, uint
1277
1277
return (char * )bin ;
1278
1278
}
1279
1279
1280
- static zend_always_inline void * zend_mm_alloc_small (zend_mm_heap * heap , size_t size , int bin_num ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC )
1280
+ static zend_always_inline void * zend_mm_alloc_small (zend_mm_heap * heap , int bin_num ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC )
1281
1281
{
1282
1282
#if ZEND_MM_STAT
1283
1283
do {
@@ -1361,7 +1361,7 @@ static zend_always_inline void *zend_mm_alloc_heap(zend_mm_heap *heap, size_t si
1361
1361
}
1362
1362
#endif
1363
1363
if (EXPECTED (size <= ZEND_MM_MAX_SMALL_SIZE )) {
1364
- ptr = zend_mm_alloc_small (heap , size , ZEND_MM_SMALL_SIZE_TO_BIN (size ) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC );
1364
+ ptr = zend_mm_alloc_small (heap , ZEND_MM_SMALL_SIZE_TO_BIN (size ) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC );
1365
1365
#if ZEND_DEBUG
1366
1366
dbg = zend_mm_get_debug_info (heap , ptr );
1367
1367
dbg -> size = real_size ;
@@ -1587,7 +1587,7 @@ static zend_always_inline void *zend_mm_realloc_heap(zend_mm_heap *heap, void *p
1587
1587
/* Check if truncation is necessary */
1588
1588
if (old_bin_num > 0 && size < bin_data_size [old_bin_num - 1 ]) {
1589
1589
/* truncation */
1590
- ret = zend_mm_alloc_small (heap , size , ZEND_MM_SMALL_SIZE_TO_BIN (size ) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC );
1590
+ ret = zend_mm_alloc_small (heap , ZEND_MM_SMALL_SIZE_TO_BIN (size ) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC );
1591
1591
copy_size = use_copy_size ? MIN (size , copy_size ) : size ;
1592
1592
memcpy (ret , ptr , copy_size );
1593
1593
zend_mm_free_small (heap , ptr , old_bin_num );
@@ -1602,7 +1602,7 @@ static zend_always_inline void *zend_mm_realloc_heap(zend_mm_heap *heap, void *p
1602
1602
do {
1603
1603
size_t orig_peak = heap -> peak ;
1604
1604
#endif
1605
- ret = zend_mm_alloc_small (heap , size , ZEND_MM_SMALL_SIZE_TO_BIN (size ) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC );
1605
+ ret = zend_mm_alloc_small (heap , ZEND_MM_SMALL_SIZE_TO_BIN (size ) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC );
1606
1606
copy_size = use_copy_size ? MIN (old_size , copy_size ) : old_size ;
1607
1607
memcpy (ret , ptr , copy_size );
1608
1608
zend_mm_free_small (heap , ptr , old_bin_num );
@@ -2451,7 +2451,7 @@ ZEND_API int is_zend_ptr(const void *ptr)
2451
2451
# define _ZEND_BIN_ALLOCATOR (_num , _size , _elements , _pages , x , y ) \
2452
2452
ZEND_API void* ZEND_FASTCALL _emalloc_ ## _size(void) { \
2453
2453
ZEND_MM_CUSTOM_ALLOCATOR(_size); \
2454
- return zend_mm_alloc_small(AG(mm_heap), _size, _num ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); \
2454
+ return zend_mm_alloc_small(AG(mm_heap), _num ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); \
2455
2455
}
2456
2456
2457
2457
ZEND_MM_BINS_INFO (_ZEND_BIN_ALLOCATOR , x , y )
0 commit comments