tony2001 Sun Oct 7 12:23:29 2007 UTC Modified files: /php-src/ext/mysqlnd mysqlnd_ps.c mysqlnd_result.c Log: fix typos http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_ps.c?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_ps.c diff -u php-src/ext/mysqlnd/mysqlnd_ps.c:1.4 php-src/ext/mysqlnd/mysqlnd_ps.c:1.5 --- php-src/ext/mysqlnd/mysqlnd_ps.c:1.4 Sun Oct 7 05:15:04 2007 +++ php-src/ext/mysqlnd/mysqlnd_ps.c Sun Oct 7 12:23:28 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysqlnd_ps.c,v 1.4 2007/10/07 05:15:04 davidw Exp $ */ +/* $Id: mysqlnd_ps.c,v 1.5 2007/10/07 12:23:28 tony2001 Exp $ */ #include "php.h" #include "mysqlnd.h" #include "mysqlnd_wireprotocol.h" @@ -1494,7 +1494,7 @@ for (i = 0; i < stmt->field_count; i++) { /* Let's try with no cache */ if (stmt->result_bind[i].bound == TRUE) { - DBG_INF_FMT("%d has refcount=%u", i, ZVAL_REFCOUNT(stmt->result_bind[i].zv)); + DBG_INF_FMT("%d has refcount=%u", i, Z_REFCOUNT_P(stmt->result_bind[i].zv)); /* We have to separate the actual zval value of the bound variable from our allocated zvals or we will face double-free http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_result.c?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_result.c diff -u php-src/ext/mysqlnd/mysqlnd_result.c:1.5 php-src/ext/mysqlnd/mysqlnd_result.c:1.6 --- php-src/ext/mysqlnd/mysqlnd_result.c:1.5 Sun Oct 7 05:15:04 2007 +++ php-src/ext/mysqlnd/mysqlnd_result.c Sun Oct 7 12:23:29 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysqlnd_result.c,v 1.5 2007/10/07 05:15:04 davidw Exp $ */ +/* $Id: mysqlnd_result.c,v 1.6 2007/10/07 12:23:29 tony2001 Exp $ */ #include "php.h" #include "mysqlnd.h" #include "mysqlnd_wireprotocol.h" @@ -1138,7 +1138,7 @@ *return_value = **entry; zval_copy_ctor(return_value); - Z_REFCOUNT_P(return_value) = 1; + Z_SET_REFCOUNT_P(return_value, 1); zval_dtor(&row); DBG_VOID_RETURN;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php