[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mysqli mysqli.c mysqli_api.c

[Antony Dovgal]

tony2001                Wed Oct 17 08:19:51 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/mysqli mysqli_api.c mysqli.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.17&r2=1.118.2.22.2.18&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.17 
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.18
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.17     Tue Oct 16 13:20:29 2007
+++ php-src/ext/mysqli/mysqli_api.c     Wed Oct 17 08:19:50 2007
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_api.c,v 1.118.2.22.2.17 2007/10/16 13:20:29 tony2001 Exp $ 
+  $Id: mysqli_api.c,v 1.118.2.22.2.18 2007/10/17 08:19:50 tony2001 Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -1170,7 +1170,7 @@
        MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link", 
MYSQLI_STATUS_VALID);
 
        if (mysql->li_read) {
-               zval_dtor(mysql->li_read);
+               zval_ptr_dtor(&(mysql->li_read));
                mysql->li_read = NULL;
        }
 }
@@ -1198,11 +1198,14 @@
                efree(callback_name);
                RETURN_FALSE;           
        }
-       efree(callback_name);
 
        /* save callback function */
-       ALLOC_ZVAL(mysql->li_read);     
-       ZVAL_STRING(mysql->li_read, callback_func->value.str.val, 1);
+       if (!mysql->li_read) {
+               MAKE_STD_ZVAL(mysql->li_read);
+       } else {
+               zval_dtor(mysql->li_read);
+       }
+       ZVAL_STRING(mysql->li_read, callback_name, 0);
 
        RETURN_TRUE;
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.19&r2=1.72.2.16.2.20&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.19 
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.20
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.19  Tue Oct 16 13:20:29 2007
+++ php-src/ext/mysqli/mysqli.c Wed Oct 17 08:19:50 2007
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli.c,v 1.72.2.16.2.19 2007/10/16 13:20:29 tony2001 Exp $ 
+  $Id: mysqli.c,v 1.72.2.16.2.20 2007/10/17 08:19:50 tony2001 Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -125,7 +125,7 @@
 /* {{{ php_clear_mysql */
 void php_clear_mysql(MY_MYSQL *mysql) {
        if (mysql->li_read) {
-               zval_dtor(mysql->li_read);
+               zval_ptr_dtor(&(mysql->li_read));
                mysql->li_read = NULL;
        }
 }

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