Skip to content

Commit 832dae0

Browse files
committed
cs-fix
1 parent 40936ff commit 832dae0

File tree

1 file changed

+12
-17
lines changed

1 file changed

+12
-17
lines changed

Zend/zend_alloc.c

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -174,16 +174,12 @@ static size_t _real_page_size = ZEND_MM_PAGE_SIZE;
174174
# include <sanitizer/asan_interface.h>
175175

176176
# if 0
177-
178177
# define ZEND_MM_POISON_DEBUG(_type, _ptr, _size) do { \
179-
fprintf(stderr, "%s %p - %p in %d\n", (_type), (_ptr), (void*) (((size_t)_ptr)+((size_t)_size)), __LINE__); \
180-
fflush(stderr); \
178+
fprintf(stderr, "%s %p - %p in %d\n", (_type), (_ptr), (void*) (((size_t)_ptr)+((size_t)_size)), __LINE__); \
179+
fflush(stderr); \
181180
} while (0);
182-
183181
# else
184-
185182
# define ZEND_MM_POISON_DEBUG(_type, _ptr, _size)
186-
187183
# endif
188184

189185
# define ZEND_MM_POISON(_ptr, _size) do { \
@@ -514,11 +510,11 @@ static void stderr_last_error(char *msg)
514510
#endif
515511

516512
static void _zend_mm_set_custom_handlers_ex(zend_mm_heap *heap,
517-
void* (*_malloc)(size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
518-
void (*_free)(void* ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
519-
void* (*_realloc)(void*, size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
520-
size_t (*_gc)(void),
521-
void (*_shutdown)(bool, bool))
513+
void* (*_malloc)(size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
514+
void (*_free)(void* ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
515+
void* (*_realloc)(void*, size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
516+
size_t (*_gc)(void),
517+
void (*_shutdown)(bool, bool))
522518
{
523519
#if ZEND_MM_CUSTOM
524520
zend_mm_heap *_heap = (zend_mm_heap*)heap;
@@ -536,13 +532,12 @@ static void _zend_mm_set_custom_handlers_ex(zend_mm_heap *heap,
536532
#endif
537533
}
538534

539-
540535
static void _zend_mm_get_custom_handlers_ex(zend_mm_heap *heap,
541-
void* (**_malloc)(size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
542-
void (**_free)(void* ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
543-
void* (**_realloc)(void*, size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
544-
size_t (**_gc)(void),
545-
void (**_shutdown)(bool, bool))
536+
void* (**_malloc)(size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
537+
void (**_free)(void* ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
538+
void* (**_realloc)(void*, size_t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC),
539+
size_t (**_gc)(void),
540+
void (**_shutdown)(bool, bool))
546541
{
547542
#if ZEND_MM_CUSTOM
548543
zend_mm_heap *_heap = (zend_mm_heap*)heap;

0 commit comments

Comments
 (0)