archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove unused parameter

Browse source
This commit is contained in:
Andrey Hristov 2010-05-03 16:09:05 +00:00
parent 676a8338a1
commit ec0fe858c6
5 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/mysqlnd/mysqlnd_block_alloc.c
View file

@ -29,7 +29,7 @@
/* {{{ mysqlnd_mempool_free_chunk */ /* {{{ mysqlnd_mempool_free_chunk */
static void static void
mysqlnd_mempool_free_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, zend_bool cache_it TSRMLS_DC) mysqlnd_mempool_free_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk TSRMLS_DC)
{ {
MYSQLND_MEMORY_POOL * pool = chunk->pool; MYSQLND_MEMORY_POOL * pool = chunk->pool;
DBG_ENTER("mysqlnd_mempool_free_chunk"); DBG_ENTER("mysqlnd_mempool_free_chunk");
@ -130,8 +130,12 @@ MYSQLND_MEMORY_POOL_CHUNK * mysqlnd_mempool_get_chunk(MYSQLND_MEMORY_POOL * pool
*/ */
chunk->pool = pool; chunk->pool = pool;
if (size > pool->free_size) { if (size > pool->free_size) {
chunk->ptr = mnd_malloc(size);
chunk->from_pool = FALSE; chunk->from_pool = FALSE;
chunk->ptr = mnd_malloc(size);
if (!chunk->ptr) {
chunk->free_chunk(chunk TSRMLS_CC);
chunk = NULL;
}
} else { } else {
chunk->from_pool = TRUE; chunk->from_pool = TRUE;
++pool->refcount; ++pool->refcount;

6
ext/mysqlnd/mysqlnd_ps.c
View file

@ -819,7 +819,7 @@ mysqlnd_stmt_fetch_row_unbuffered(MYSQLND_RES *result, void *param, unsigned int
the bound variables. Thus we need to do part of what it does or Zend will the bound variables. Thus we need to do part of what it does or Zend will
report leaks. report leaks.
*/ */
row_packet->row_buffer->free_chunk(row_packet->row_buffer, TRUE TSRMLS_CC); row_packet->row_buffer->free_chunk(row_packet->row_buffer TSRMLS_CC);
row_packet->row_buffer = NULL; row_packet->row_buffer = NULL;
} }
} else if (ret == FAIL) { } else if (ret == FAIL) {
@ -998,13 +998,13 @@ mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES *result, void *param, unsigned int fla
the bound variables. Thus we need to do part of what it does or Zend will the bound variables. Thus we need to do part of what it does or Zend will
report leaks. report leaks.
*/ */
row_packet->row_buffer->free_chunk(row_packet->row_buffer, TRUE TSRMLS_CC); row_packet->row_buffer->free_chunk(row_packet->row_buffer TSRMLS_CC);
row_packet->row_buffer = NULL; row_packet->row_buffer = NULL;
} }
/* We asked for one row, the next one should be EOF, eat it */ /* We asked for one row, the next one should be EOF, eat it */
ret = PACKET_READ(row_packet, result->conn); ret = PACKET_READ(row_packet, result->conn);
if (row_packet->row_buffer) { if (row_packet->row_buffer) {
row_packet->row_buffer->free_chunk(row_packet->row_buffer, TRUE TSRMLS_CC); row_packet->row_buffer->free_chunk(row_packet->row_buffer TSRMLS_CC);
row_packet->row_buffer = NULL; row_packet->row_buffer = NULL;
} }
MYSQLND_INC_CONN_STATISTIC(stmt->conn->stats, STAT_ROWS_FETCHED_FROM_CLIENT_PS_CURSOR); MYSQLND_INC_CONN_STATISTIC(stmt->conn->stats, STAT_ROWS_FETCHED_FROM_CLIENT_PS_CURSOR);

4
ext/mysqlnd/mysqlnd_result.c
View file

@ -166,7 +166,7 @@ MYSQLND_METHOD(mysqlnd_res, unbuffered_free_last_data)(MYSQLND_RES * result TSRM
if (unbuf->last_row_buffer) { if (unbuf->last_row_buffer) {
DBG_INF("Freeing last row buffer"); DBG_INF("Freeing last row buffer");
/* Nothing points to this buffer now, free it */ /* Nothing points to this buffer now, free it */
unbuf->last_row_buffer->free_chunk(unbuf->last_row_buffer, TRUE TSRMLS_CC); unbuf->last_row_buffer->free_chunk(unbuf->last_row_buffer TSRMLS_CC);
unbuf->last_row_buffer = NULL; unbuf->last_row_buffer = NULL;
} }
@ -207,7 +207,7 @@ MYSQLND_METHOD(mysqlnd_res, free_buffered_data)(MYSQLND_RES * result TSRMLS_DC)
#if MYSQLND_DEBUG_MEMORY #if MYSQLND_DEBUG_MEMORY
DBG_INF("Freeing current_row & current_buffer"); DBG_INF("Freeing current_row & current_buffer");
#endif #endif
current_buffer->free_chunk(current_buffer, TRUE TSRMLS_CC); current_buffer->free_chunk(current_buffer TSRMLS_CC);
} }
DBG_INF("Freeing data & row_buffer"); DBG_INF("Freeing data & row_buffer");
if (set->data) { if (set->data) {

2
ext/mysqlnd/mysqlnd_structs.h
View file

@ -49,7 +49,7 @@ struct st_mysqlnd_memory_pool_chunk
zend_uchar *ptr; zend_uchar *ptr;
unsigned int size; unsigned int size;
enum_func_status (*resize_chunk)(MYSQLND_MEMORY_POOL_CHUNK * chunk, unsigned int size TSRMLS_DC); enum_func_status (*resize_chunk)(MYSQLND_MEMORY_POOL_CHUNK * chunk, unsigned int size TSRMLS_DC);
void (*free_chunk)(MYSQLND_MEMORY_POOL_CHUNK * chunk, zend_bool cache_it TSRMLS_DC); void (*free_chunk)(MYSQLND_MEMORY_POOL_CHUNK * chunk TSRMLS_DC);
zend_bool from_pool; zend_bool from_pool;
}; };

4
ext/mysqlnd/mysqlnd_wireprotocol.c
View file

@ -1169,7 +1169,7 @@ php_mysqlnd_read_row_ex(MYSQLND * conn, MYSQLND_MEMORY_POOL * result_set_memory_
} }
} }
if (ret == FAIL && *buffer) { if (ret == FAIL && *buffer) {
(*buffer)->free_chunk((*buffer), TRUE TSRMLS_CC); (*buffer)->free_chunk((*buffer) TSRMLS_CC);
*buffer = NULL; *buffer = NULL;
} }
*data_size -= prealloc_more_bytes; *data_size -= prealloc_more_bytes;
@ -1594,7 +1594,7 @@ php_mysqlnd_rowp_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
DBG_ENTER("php_mysqlnd_rowp_free_mem"); DBG_ENTER("php_mysqlnd_rowp_free_mem");
p = (MYSQLND_PACKET_ROW *) _packet; p = (MYSQLND_PACKET_ROW *) _packet;
if (p->row_buffer) { if (p->row_buffer) {
p->row_buffer->free_chunk(p->row_buffer, TRUE TSRMLS_CC); p->row_buffer->free_chunk(p->row_buffer TSRMLS_CC);
p->row_buffer = NULL; p->row_buffer = NULL;
} }
DBG_INF_FMT("alloca=%d persistent=%d", (int)alloca, (int)p->header.persistent); DBG_INF_FMT("alloca=%d persistent=%d", (int)alloca, (int)p->header.persistent);