diff options
Diffstat (limited to 'ext/mysqlnd/mysqlnd_block_alloc.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_block_alloc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/mysqlnd/mysqlnd_block_alloc.c b/ext/mysqlnd/mysqlnd_block_alloc.c index e68d80d236..25e4040c0e 100644 --- a/ext/mysqlnd/mysqlnd_block_alloc.c +++ b/ext/mysqlnd/mysqlnd_block_alloc.c @@ -1,8 +1,8 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 2006-2015 The PHP Group | + | Copyright (c) 2006-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -29,7 +29,7 @@ /* {{{ mysqlnd_mempool_free_chunk */ static void -mysqlnd_mempool_free_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk TSRMLS_DC) +mysqlnd_mempool_free_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk) { MYSQLND_MEMORY_POOL * pool = chunk->pool; DBG_ENTER("mysqlnd_mempool_free_chunk"); @@ -54,7 +54,7 @@ mysqlnd_mempool_free_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk TSRMLS_DC) /* {{{ mysqlnd_mempool_resize_chunk */ static enum_func_status -mysqlnd_mempool_resize_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, unsigned int size TSRMLS_DC) +mysqlnd_mempool_resize_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, unsigned int size) { DBG_ENTER("mysqlnd_mempool_resize_chunk"); if (chunk->from_pool) { @@ -112,7 +112,7 @@ mysqlnd_mempool_resize_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, unsigned int siz /* {{{ mysqlnd_mempool_get_chunk */ static -MYSQLND_MEMORY_POOL_CHUNK * mysqlnd_mempool_get_chunk(MYSQLND_MEMORY_POOL * pool, unsigned int size TSRMLS_DC) +MYSQLND_MEMORY_POOL_CHUNK * mysqlnd_mempool_get_chunk(MYSQLND_MEMORY_POOL * pool, unsigned int size) { MYSQLND_MEMORY_POOL_CHUNK *chunk = NULL; DBG_ENTER("mysqlnd_mempool_get_chunk"); @@ -132,7 +132,7 @@ MYSQLND_MEMORY_POOL_CHUNK * mysqlnd_mempool_get_chunk(MYSQLND_MEMORY_POOL * pool chunk->from_pool = FALSE; chunk->ptr = mnd_malloc(size); if (!chunk->ptr) { - chunk->free_chunk(chunk TSRMLS_CC); + chunk->free_chunk(chunk); chunk = NULL; } } else { @@ -150,7 +150,7 @@ MYSQLND_MEMORY_POOL_CHUNK * mysqlnd_mempool_get_chunk(MYSQLND_MEMORY_POOL * pool /* {{{ mysqlnd_mempool_create */ PHPAPI MYSQLND_MEMORY_POOL * -mysqlnd_mempool_create(size_t arena_size TSRMLS_DC) +mysqlnd_mempool_create(size_t arena_size) { /* We calloc, because we free(). We don't mnd_calloc() for a reason. */ MYSQLND_MEMORY_POOL * ret = mnd_calloc(1, sizeof(MYSQLND_MEMORY_POOL)); @@ -162,7 +162,7 @@ mysqlnd_mempool_create(size_t arena_size TSRMLS_DC) /* OOM ? */ ret->arena = mnd_malloc(ret->arena_size); if (!ret->arena) { - mysqlnd_mempool_destroy(ret TSRMLS_CC); + mysqlnd_mempool_destroy(ret); ret = NULL; } } @@ -173,7 +173,7 @@ mysqlnd_mempool_create(size_t arena_size TSRMLS_DC) /* {{{ mysqlnd_mempool_destroy */ PHPAPI void -mysqlnd_mempool_destroy(MYSQLND_MEMORY_POOL * pool TSRMLS_DC) +mysqlnd_mempool_destroy(MYSQLND_MEMORY_POOL * pool) { DBG_ENTER("mysqlnd_mempool_destroy"); /* mnd_free will reference LOCK_access and might crash, depending on the caller...*/ |