diff options
| author | Andrey Hristov <andrey@php.net> | 2011-03-22 14:39:58 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2011-03-22 14:39:58 +0000 |
| commit | 3ffac762b05c49e7b44e04ffad92c86f15741c94 (patch) | |
| tree | 15cfd776ad9e845fadb3df152e94d0bf403c16ed /ext | |
| parent | a6d4f047d4d1c0893303163a57d2354afee86457 (diff) | |
| download | php-git-3ffac762b05c49e7b44e04ffad92c86f15741c94.tar.gz | |
palloc is long dead, use more appropriate name
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_result.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index 7ba3a6acc8..30368f4346 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -83,11 +83,11 @@ MYSQLND_METHOD(mysqlnd_res, initialize_result_set_rest)(MYSQLND_RES * const resu /* }}} */ -/* {{{ mysqlnd_palloc_zval_ptr_dtor */ -static -void mysqlnd_palloc_zval_ptr_dtor(zval **zv, enum_mysqlnd_res_type type, zend_bool * copy_ctor_called TSRMLS_DC) +/* {{{ mysqlnd_rset_zval_ptr_dtor */ +static void +mysqlnd_rset_zval_ptr_dtor(zval **zv, enum_mysqlnd_res_type type, zend_bool * copy_ctor_called TSRMLS_DC) { - DBG_ENTER("mysqlnd_palloc_zval_ptr_dtor"); + DBG_ENTER("mysqlnd_rset_zval_ptr_dtor"); if (!zv || !*zv) { *copy_ctor_called = FALSE; DBG_ERR_FMT("zv was NULL"); @@ -155,7 +155,7 @@ MYSQLND_METHOD(mysqlnd_res, unbuffered_free_last_data)(MYSQLND_RES * result TSRM MYSQLND_STATS *global_stats = result->conn? result->conn->stats:NULL; for (i = 0; i < result->field_count; i++) { - mysqlnd_palloc_zval_ptr_dtor(&(unbuf->last_row_data[i]), result->type, ©_ctor_called TSRMLS_CC); + mysqlnd_rset_zval_ptr_dtor(&(unbuf->last_row_data[i]), result->type, ©_ctor_called TSRMLS_CC); if (copy_ctor_called) { ++ctor_called_count; } @@ -207,7 +207,7 @@ MYSQLND_METHOD(mysqlnd_res, free_buffered_data)(MYSQLND_RES * result TSRMLS_DC) for (col = field_count - 1; col >= 0; --col) { if (current_row[col]) { zend_bool copy_ctor_called; - mysqlnd_palloc_zval_ptr_dtor(&(current_row[col]), result->type, ©_ctor_called TSRMLS_CC); + mysqlnd_rset_zval_ptr_dtor(&(current_row[col]), result->type, ©_ctor_called TSRMLS_CC); if (copy_ctor_called) { ++copy_on_write_performed; } else { |