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

[Andrey Hristov]

andrey          Wed May 27 14:16:00 2009 UTC

  Modified files:              
    /php-src/ext/mysqli mysqli_prop.c 
  Log:
  Revert previous patch to something that make sense and works in error cases
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_prop.c?r1=1.43&r2=1.44&diff_format=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.43 
php-src/ext/mysqli/mysqli_prop.c:1.44
--- php-src/ext/mysqli/mysqli_prop.c:1.43       Wed May 20 08:29:23 2009
+++ php-src/ext/mysqli/mysqli_prop.c    Wed May 27 14:16:00 2009
@@ -17,7 +17,7 @@
   |          Ulf Wendel <u...@php.net>                                     |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_prop.c,v 1.43 2009/05/20 08:29:23 kalle Exp $ 
+  $Id: mysqli_prop.c,v 1.44 2009/05/27 14:16:00 andrey Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -158,7 +158,7 @@
 static int link_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC)
 {
        MY_MYSQL *mysql;
-       long rc;
+       my_ulonglong rc;
 
        MAKE_STD_ZVAL(*retval); 
 
@@ -171,9 +171,9 @@
        } else {
                CHECK_STATUS(MYSQLI_STATUS_VALID);
 
-               rc = (long) mysql_affected_rows(mysql->mysql);
+               rc = (my_ulonglong) mysql_affected_rows(mysql->mysql);
 
-               if (rc == (long)-1) {
+               if (rc == (my_ulonglong) -1) {
                        ZVAL_LONG(*retval, -1);
                        return SUCCESS;
                } 
@@ -182,7 +182,7 @@
                        ZVAL_LONG(*retval, rc);
                } else {
                        char *ret;
-                       int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, 
(my_ulonglong) rc);
+                       int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, rc);
                        ZVAL_STRINGL(*retval, ret, l, 0);
                }
        }
@@ -233,15 +233,14 @@
 
        CHECK_STATUS(MYSQLI_STATUS_VALID);
        p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr;
-       if (!p || !p->field_count || !(ret = mysql_fetch_lengths(p)))
-       {
+       if (!p || !p->field_count || !(ret = mysql_fetch_lengths(p))) {
                ZVAL_NULL(*retval);
        } else {
                ulong i;
 
                array_init(*retval);
 
-               for (i=0; i < p->field_count; i++) {
+               for (i = 0; i < p->field_count; i++) {
                        add_index_long(*retval, i, ret[i]);
                }
        }
@@ -279,7 +278,7 @@
 static int stmt_affected_rows_read(mysqli_object *obj, zval **retval TSRMLS_DC)
 {
        MY_STMT *p;
-       long rc;
+       my_ulonglong rc;
 
        MAKE_STD_ZVAL(*retval); 
        CHECK_STATUS(MYSQLI_STATUS_VALID);
@@ -289,9 +288,9 @@
        if (!p) {
                ZVAL_NULL(*retval);
        } else {
-               rc = (long) mysql_stmt_affected_rows(p->stmt);
+               rc = (my_ulonglong) mysql_stmt_affected_rows(p->stmt);
        
-               if (rc == (long)-1) {
+               if (rc == (my_ulonglong) -1) {
                        ZVAL_LONG(*retval, -1);
                        return SUCCESS;
                } 
@@ -300,7 +299,7 @@
                        ZVAL_LONG(*retval, rc);
                } else {
                        char *ret;
-                       int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, 
(my_longlong) rc);
+                       int l = spprintf(&ret, 0, MYSQLI_LLU_SPEC, rc);
                        ZVAL_STRINGL(*retval, ret, l, 0);
                }
        }



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