[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c trunk/ext/mysqlnd/mysqlnd_result.c

[Andrey Hristov]

andrey                                   Tue, 22 Mar 2011 14:39:58 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=309562

Log:
palloc is long dead, use more appropriate name

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
    U   php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c   2011-03-22 
14:39:36 UTC (rev 309561)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c   2011-03-22 
14:39:58 UTC (rev 309562)
@@ -84,11 +84,11 @@
 /* }}} */


-/* {{{ 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");
@@ -158,7 +158,7 @@

                DBG_INF_FMT("%u columns to free", result->field_count);
                for (i = 0; i < result->field_count; i++) {
-                       
mysqlnd_palloc_zval_ptr_dtor(&(unbuf->last_row_data[i]), result->type, 
&copy_ctor_called TSRMLS_CC);
+                       mysqlnd_rset_zval_ptr_dtor(&(unbuf->last_row_data[i]), 
result->type, &copy_ctor_called TSRMLS_CC);
                        if (copy_ctor_called) {
                                ++ctor_called_count;
                        }
@@ -212,7 +212,7 @@
                                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, 
&copy_ctor_called TSRMLS_CC);
+                                               
mysqlnd_rset_zval_ptr_dtor(&(current_row[col]), result->type, &copy_ctor_called 
TSRMLS_CC);
 #if MYSQLND_DEBUG_MEMORY
                                                
DBG_INF_FMT("Copy_ctor_called=%u", copy_ctor_called);
 #endif

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c      2011-03-22 14:39:36 UTC 
(rev 309561)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c      2011-03-22 14:39:58 UTC 
(rev 309562)
@@ -83,11 +83,11 @@
 /* }}} */


-/* {{{ 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_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, 
&copy_ctor_called TSRMLS_CC);
+                       mysqlnd_rset_zval_ptr_dtor(&(unbuf->last_row_data[i]), 
result->type, &copy_ctor_called TSRMLS_CC);
                        if (copy_ctor_called) {
                                ++ctor_called_count;
                        }
@@ -207,7 +207,7 @@
                                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, 
&copy_ctor_called TSRMLS_CC);
+                                               
mysqlnd_rset_zval_ptr_dtor(&(current_row[col]), result->type, &copy_ctor_called 
TSRMLS_CC);
                                                if (copy_ctor_called) {
                                                        
++copy_on_write_performed;
                                                } else {


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php