diff options
author | Andrey Hristov <andrey@php.net> | 2007-10-16 20:58:35 +0000 |
---|---|---|
committer | Andrey Hristov <andrey@php.net> | 2007-10-16 20:58:35 +0000 |
commit | a0aa80a3f81516add499b06905e6a7264112eccd (patch) | |
tree | a4a92a3ba36c33a11ac205797e95e4d3a282ce59 /ext/mysqlnd/mysqlnd_palloc.c | |
parent | 0655ad383363101dde04a9e98f540f6b54014f43 (diff) | |
download | php-git-a0aa80a3f81516add499b06905e6a7264112eccd.tar.gz |
Sync mysqlnd with HEAD. Same sources as in 5_3
Diffstat (limited to 'ext/mysqlnd/mysqlnd_palloc.c')
-rw-r--r-- | ext/mysqlnd/mysqlnd_palloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/mysqlnd/mysqlnd_palloc.c b/ext/mysqlnd/mysqlnd_palloc.c index 819c9def3e..d03af9cc18 100644 --- a/ext/mysqlnd/mysqlnd_palloc.c +++ b/ext/mysqlnd/mysqlnd_palloc.c @@ -359,7 +359,7 @@ void mysqlnd_palloc_zval_ptr_dtor(zval **zv, MYSQLND_THD_ZVAL_PCACHE * const thd */ if (type == MYSQLND_RES_PS_BUF || type == MYSQLND_RES_PS_UNBUF) { ; /* do nothing, zval_ptr_dtor will do the job*/ - } else if (Z_REFCOUNT_P(*zv) > 1) { + } else if (Z_REFCOUNT_PP(zv) > 1) { /* Not a prepared statement, then we have to call copy_ctor and then zval_ptr_dtor() @@ -389,7 +389,7 @@ void mysqlnd_palloc_zval_ptr_dtor(zval **zv, MYSQLND_THD_ZVAL_PCACHE * const thd /* The zval is from our cache */ /* refcount is always > 1, because we call Z_ADDREF_P(). Thus test refcount > 2 */ - if (Z_REFCOUNT_P(*zv) > 2) { + if (Z_REFCOUNT_PP(zv) > 2) { /* Because the zval is first element in mysqlnd_zval structure, then we can do upcasting from zval to mysqlnd_zval here. Because we know that this @@ -435,7 +435,7 @@ void mysqlnd_palloc_zval_ptr_dtor(zval **zv, MYSQLND_THD_ZVAL_PCACHE * const thd ++cache->put_hits; ++cache->free_items; ((mysqlnd_zval *)*zv)->point_type = MYSQLND_POINTS_FREE; - Z_DELREF_P(*zv); /* Make it 1 */ + Z_DELREF_PP(zv); /* Make it 1 */ ZVAL_NULL(*zv); #ifdef ZTS memset(&((mysqlnd_zval *)*zv)->thread_id, 0, sizeof(THREAD_T)); |