]> granicus.if.org Git - php/commitdiff
Unused parameter
authorDmitry Stogov <dmitry@zend.com>
Fri, 1 Mar 2019 11:34:17 +0000 (14:34 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 1 Mar 2019 11:34:17 +0000 (14:34 +0300)
Zend/zend_alloc.c

index 498956c52f68f48f31c053b8088dc0a1f57cd993..2165c532f59ae51f161fb5aca5f9fe62309b9a3b 100644 (file)
@@ -1277,7 +1277,7 @@ static zend_never_inline void *zend_mm_alloc_small_slow(zend_mm_heap *heap, uint
        return (char*)bin;
 }
 
-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)
+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)
 {
 #if ZEND_MM_STAT
        do {
@@ -1361,7 +1361,7 @@ static zend_always_inline void *zend_mm_alloc_heap(zend_mm_heap *heap, size_t si
        }
 #endif
        if (EXPECTED(size <= ZEND_MM_MAX_SMALL_SIZE)) {
-               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);
+               ptr = zend_mm_alloc_small(heap, ZEND_MM_SMALL_SIZE_TO_BIN(size) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
 #if ZEND_DEBUG
                dbg = zend_mm_get_debug_info(heap, ptr);
                dbg->size = real_size;
@@ -1587,7 +1587,7 @@ static zend_always_inline void *zend_mm_realloc_heap(zend_mm_heap *heap, void *p
                                        /* Check if truncation is necessary */
                                        if (old_bin_num > 0 && size < bin_data_size[old_bin_num - 1]) {
                                                /* truncation */
-                                               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);
+                                               ret = zend_mm_alloc_small(heap, ZEND_MM_SMALL_SIZE_TO_BIN(size) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
                                                copy_size = use_copy_size ? MIN(size, copy_size) : size;
                                                memcpy(ret, ptr, copy_size);
                                                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
                                        do {
                                                size_t orig_peak = heap->peak;
 #endif
-                                               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);
+                                               ret = zend_mm_alloc_small(heap, ZEND_MM_SMALL_SIZE_TO_BIN(size) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
                                                copy_size = use_copy_size ? MIN(old_size, copy_size) : old_size;
                                                memcpy(ret, ptr, copy_size);
                                                zend_mm_free_small(heap, ptr, old_bin_num);
@@ -2451,7 +2451,7 @@ ZEND_API int is_zend_ptr(const void *ptr)
 # define _ZEND_BIN_ALLOCATOR(_num, _size, _elements, _pages, x, y) \
        ZEND_API void* ZEND_FASTCALL _emalloc_ ## _size(void) { \
                ZEND_MM_CUSTOM_ALLOCATOR(_size); \
-               return zend_mm_alloc_small(AG(mm_heap), _size, _num ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); \
+               return zend_mm_alloc_small(AG(mm_heap), _num ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); \
        }
 
 ZEND_MM_BINS_INFO(_ZEND_BIN_ALLOCATOR, x, y)