tony2001 Mon Jul 10 13:02:43 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mysqli mysqli.c
Log:
MFH: fix mysqli_*_free_storage() funcs to conform with their prototypes
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.8&r2=1.72.2.16.2.9&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.8
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.9
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.8 Mon Jul 10 12:46:28 2006
+++ php-src/ext/mysqli/mysqli.c Mon Jul 10 13:02:43 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.72.2.16.2.8 2006/07/10 12:46:28 dmitry Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.9 2006/07/10 13:02:43 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -134,9 +134,10 @@
/* {{{ mysqli_objects_free_storage
*/
-static void mysqli_objects_free_storage(zend_object *object TSRMLS_DC)
+static void mysqli_objects_free_storage(void *object TSRMLS_DC)
{
- mysqli_object *intern = (mysqli_object *)object;
+ zend_object *zo = (zend_object *)object;
+ mysqli_object *intern = (mysqli_object *)zo;
MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern->ptr;
my_efree(my_res);
@@ -147,9 +148,10 @@
/* {{{ mysqli_link_free_storage
*/
-static void mysqli_link_free_storage(zend_object *object TSRMLS_DC)
+static void mysqli_link_free_storage(void *object TSRMLS_DC)
{
- mysqli_object *intern = (mysqli_object *)object;
+ zend_object *zo = (zend_object *)object;
+ mysqli_object *intern = (mysqli_object *)zo;
MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern->ptr;
if (my_res && my_res->ptr) {
@@ -166,9 +168,10 @@
/* {{{ mysqli_stmt_free_storage
*/
-static void mysqli_stmt_free_storage(zend_object *object TSRMLS_DC)
+static void mysqli_stmt_free_storage(void *object TSRMLS_DC)
{
- mysqli_object *intern = (mysqli_object *)object;
+ zend_object *zo = (zend_object *)object;
+ mysqli_object *intern = (mysqli_object *)zo;
MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern->ptr;
if (my_res && my_res->ptr) {
@@ -181,9 +184,10 @@
/* {{{ mysqli_result_free_storage
*/
-static void mysqli_result_free_storage(zend_object *object TSRMLS_DC)
+static void mysqli_result_free_storage(void *object TSRMLS_DC)
{
- mysqli_object *intern = (mysqli_object *)object;
+ zend_object *zo = (zend_object *)object;
+ mysqli_object *intern = (mysqli_object *)zo;
MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern->ptr;
if (my_res && my_res->ptr) {
@@ -195,9 +199,10 @@
/* {{{ mysqli_warning_free_storage
*/
-static void mysqli_warning_free_storage(zend_object *object TSRMLS_DC)
+static void mysqli_warning_free_storage(void *object TSRMLS_DC)
{
- mysqli_object *intern = (mysqli_object *)object;
+ zend_object *zo = (zend_object *)object;
+ mysqli_object *intern = (mysqli_object *)zo;
MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern->ptr;
if (my_res && my_res->ptr) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
