diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-07-10 13:02:43 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-07-10 13:02:43 +0000 |
| commit | d9d23050d1adf4d7484305e5adf1f6efb45e29a2 (patch) | |
| tree | 3279e686d412be863c277a93a850f3be5b3ec0d2 | |
| parent | 26c7981ccfae5224c499dd92f9d0ce6311f364c3 (diff) | |
| download | php-git-d9d23050d1adf4d7484305e5adf1f6efb45e29a2.tar.gz | |
MFH: fix mysqli_*_free_storage() funcs to conform with their prototypes
| -rw-r--r-- | ext/mysqli/mysqli.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 7f631f6708..474211be46 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -134,9 +134,10 @@ void php_clear_mysql(MY_MYSQL *mysql) { /* {{{ 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 @@ static void mysqli_objects_free_storage(zend_object *object TSRMLS_DC) /* {{{ 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 @@ static void mysqli_link_free_storage(zend_object *object TSRMLS_DC) /* {{{ 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 @@ static void mysqli_stmt_free_storage(zend_object *object TSRMLS_DC) /* {{{ 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 @@ static void mysqli_result_free_storage(zend_object *object TSRMLS_DC) /* {{{ 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) { |