Commit 9d42038

committed

drop redundant zend_mm_heap_free()

1 parent 82f3923 commit 9d42038Copy full SHA for 9d42038

File tree

-7

lines changed

-7

lines changed

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -3137,11 +3137,6 @@ ZEND_API zend_mm_heap *zend_mm_get_heap(void)`
`3137`	`3137`	`return AG(mm_heap);`
`3138`	`3138`	`}`
`3139`	`3139`
`3140`		`-ZEND_API void zend_mm_heap_free(zend_mm_heap *heap)`
`3141`		`-{`
`3142`		`- zend_mm_chunk_free(heap, heap->main_chunk, ZEND_MM_CHUNK_SIZE);`
`3143`		`-}`
`3144`		`-`
`3145`	`3140`	`ZEND_API bool zend_mm_is_custom_heap(zend_mm_heap *new_heap)`
`3146`	`3141`	`{`
`3147`	`3142`	`#if ZEND_MM_CUSTOM`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,6 @@ ZEND_API size_t ZEND_FASTCALL _zend_mm_block_size(zend_mm_heap heap, void p ZE`
`263`	`263`	`#define zend_mm_realloc2_rel(heap, p, size, copy_size) _zend_mm_realloc2((heap), (p), (size), (copy_size) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)`
`264`	`264`	`#define zend_mm_block_size_rel(heap, p) _zend_mm_block_size((heap), (p) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)`
`265`	`265`
`266`		`-ZEND_API void zend_mm_heap_free(zend_mm_heap* heap);`
`267`	`266`	`ZEND_API zend_mm_heap zend_mm_set_heap(zend_mm_heap new_heap);`
`268`	`267`	`ZEND_API zend_mm_heap *zend_mm_get_heap(void);`
`269`	`268`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,15 @@ void zend_test_mm_custom_handlers_shutdown(void)`
`125`	`125`	`return;`
`126`	`126`	`}`
`127`	`127`	`zend_mm_set_heap(ZT_G(original_heap));`
`128`		`- zend_mm_heap_free(ZT_G(observed_heap));`
	`128`	`+ zend_mm_set_custom_handlers(`
	`129`	`+ ZT_G(observed_heap),`
	`130`	`+ NULL,`
	`131`	`+ NULL,`
	`132`	`+ NULL,`
	`133`	`+ NULL,`
	`134`	`+ NULL`
	`135`	`+ );`
	`136`	`+ zend_mm_shutdown(ZT_G(observed_heap), true, true);`
`129`	`137`	`ZT_G(observed_heap) = NULL;`
`130`	`138`	`printf("Prev heap at %p restored in ZendMM\n", ZT_G(original_heap));`
`131`	`139`	`}`

Comments

(0)