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

[Georg Richter]

georg           Mon Dec  6 00:15:36 2004 EDT

  Modified files:              (Branch: PHP_5_0)
    /php-src/ext/mysqli mysqli_prop.c 
  Log:
  MFH: fixed windows compile errors
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_prop.c?r1=1.14.2.2&r2=1.14.2.3&ty=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.14.2.2 
php-src/ext/mysqli/mysqli_prop.c:1.14.2.3
--- php-src/ext/mysqli/mysqli_prop.c:1.14.2.2   Sat Dec  4 04:01:33 2004
+++ php-src/ext/mysqli/mysqli_prop.c    Mon Dec  6 00:15:36 2004
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_prop.c,v 1.14.2.2 2004/12/04 09:01:33 georg Exp $ 
+  $Id: mysqli_prop.c,v 1.14.2.3 2004/12/06 05:15:36 georg Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -39,19 +39,26 @@
 
 
 #define MYSQLI_GET_MYSQL() \
-MYSQL *p = (MYSQL *)((MY_MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr)->mysql;
+MYSQL *p; \
+ALLOC_ZVAL(*retval);\
+CHECK_OBJECT(); \
+p = (MYSQL *)((MY_MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr)->mysql;
 
 #define MYSQLI_GET_RESULT() \
-MYSQL_RES *p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr
+MYSQL_RES *p; \
+ALLOC_ZVAL(*retval);\
+CHECK_OBJECT(); \
+p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr
 
 #define MYSQLI_GET_STMT() \
-MYSQL_STMT *p = (MYSQL_STMT *)((MY_STMT *)((MYSQLI_RESOURCE 
*)(obj->ptr))->ptr)->stmt
+MYSQL_STMT *p; \
+ALLOC_ZVAL(*retval);\
+CHECK_OBJECT(); \
+p = (MYSQL_STMT *)((MY_STMT *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr)->stmt
 
 #define MYSQLI_MAP_PROPERTY_FUNC_LONG( __func, __int_func, __get_type, 
__ret_type)\
 int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
 {\
-       ALLOC_ZVAL(*retval); \
-       CHECK_OBJECT(); \
        __ret_type l;\
        __get_type;\
        if (!p) {\
@@ -73,8 +80,6 @@
 int __func(mysqli_object *obj, zval **retval TSRMLS_DC)\
 {\
        char *c;\
-       ALLOC_ZVAL(*retval); \
-       CHECK_OBJECT(); \
        __get_type;\
        if (!p) {\
                ZVAL_NULL(*retval);\
@@ -145,10 +150,12 @@
 /* {{{ property result_type_read */
 int result_type_read(mysqli_object *obj, zval **retval TSRMLS_DC)
 {
+       MYSQL_RES *p;
+
        ALLOC_ZVAL(*retval); 
        CHECK_OBJECT();
 
-       MYSQL_RES *p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr;
+       p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr;
 
        if (!p) {
                ZVAL_NULL(*retval);
@@ -162,12 +169,13 @@
 /* {{{ property result_lengths_read */
 int result_lengths_read(mysqli_object *obj, zval **retval TSRMLS_DC)
 {
+       MYSQL_RES *p;
+
        ALLOC_ZVAL(*retval); 
        CHECK_OBJECT();
 
-       MYSQL_RES *p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr;
+       p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr;
 
-       ALLOC_ZVAL(*retval);
        if (!p || !p->field_count) {
                ZVAL_NULL(*retval);
        } else {

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