Remove unused parameter

diff --git a/ext/mysqlnd/mysqlnd_block_alloc.c b/ext/mysqlnd/mysqlnd_block_alloc.c
index 40f42109f194e82345c4f8e7f457364f246798d5..47b4c4af66a41b3ced312d31391fedb1da58e086 100644 (file)
--- a/ext/mysqlnd/mysqlnd_block_alloc.c
+++ b/ext/mysqlnd/mysqlnd_block_alloc.c
@@ -29,7 +29,7 @@
 
 /* {{{ mysqlnd_mempool_free_chunk */
 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;
        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;
        if (size > pool->free_size) {
-               chunk->ptr = mnd_malloc(size);
                chunk->from_pool = FALSE;
+               chunk->ptr = mnd_malloc(size);
+               if (!chunk->ptr) {
+                       chunk->free_chunk(chunk TSRMLS_CC);
+                       chunk = NULL;
+               }
        } else {
                chunk->from_pool = TRUE;
                ++pool->refcount;

diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c
index 156cb51475d1ffd3d99a51f816e6f6ac12999028..4115e685403ae0ef4ffd754bf140aa7f8efd83c2 100644 (file)
--- a/ext/mysqlnd/mysqlnd_ps.c
+++ b/ext/mysqlnd/mysqlnd_ps.c
@@ -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
                          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;
                }
        } 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
                          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;
                }
                /* We asked for one row, the next one should be EOF, eat it */
                ret = PACKET_READ(row_packet, result->conn);
                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;
                }
                MYSQLND_INC_CONN_STATISTIC(stmt->conn->stats, STAT_ROWS_FETCHED_FROM_CLIENT_PS_CURSOR);

diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index a1b609f97aa249c358e613f4f9b15913c31526ad..657fa406991d274a36206a1782bb511dd886b17a 100644 (file)
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -166,7 +166,7 @@ MYSQLND_METHOD(mysqlnd_res, unbuffered_free_last_data)(MYSQLND_RES * result TSRM
        if (unbuf->last_row_buffer) {
                DBG_INF("Freeing last row buffer");
                /* 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;
        }
 
@@ -207,7 +207,7 @@ MYSQLND_METHOD(mysqlnd_res, free_buffered_data)(MYSQLND_RES * result TSRMLS_DC)
 #if MYSQLND_DEBUG_MEMORY
                DBG_INF("Freeing current_row & current_buffer");
 #endif
-               current_buffer->free_chunk(current_buffer, TRUE TSRMLS_CC);
+               current_buffer->free_chunk(current_buffer TSRMLS_CC);
        }
        DBG_INF("Freeing data & row_buffer");
        if (set->data) {

diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h
index a74d7d6d2b118de4520805a9fe75861b52073b9c..0553ac1fdb7320677cd3935d1180f6d44e419643 100644 (file)
--- a/ext/mysqlnd/mysqlnd_structs.h
+++ b/ext/mysqlnd/mysqlnd_structs.h
@@ -49,7 +49,7 @@ struct st_mysqlnd_memory_pool_chunk
        zend_uchar                      *ptr;
        unsigned int            size;
        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;
 };
 

diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
index 6e0adf56208e86ba120b82f3b5c31d0d6b7b4166..9896788dd19bd0ae1b442d4730bbcbc5cac6ca07 100644 (file)
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -1169,7 +1169,7 @@ php_mysqlnd_read_row_ex(MYSQLND * conn, MYSQLND_MEMORY_POOL * result_set_memory_
                }
        }
        if (ret == FAIL && *buffer) {
-               (*buffer)->free_chunk((*buffer), TRUE TSRMLS_CC);
+               (*buffer)->free_chunk((*buffer) TSRMLS_CC);
                *buffer = NULL;
        }
        *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");
        p = (MYSQLND_PACKET_ROW *) _packet;
        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;
        }
        DBG_INF_FMT("alloca=%d persistent=%d", (int)alloca, (int)p->header.persistent);