[PHP-CVS] cvs: php-src /ext/pdo pdo_dbh.c pdo_stmt.c

[Pierre-Alain Joye]

pajoye          Thu Nov 13 14:36:57 2008 UTC

  Modified files:              
    /php-src/ext/pdo    pdo_stmt.c pdo_dbh.c 
  Log:
  - declarations go first....
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.209&r2=1.210&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.209 php-src/ext/pdo/pdo_stmt.c:1.210
--- php-src/ext/pdo/pdo_stmt.c:1.209    Mon Nov 10 20:34:53 2008
+++ php-src/ext/pdo/pdo_stmt.c  Thu Nov 13 14:36:56 2008
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: pdo_stmt.c,v 1.209 2008/11/10 20:34:53 davidc Exp $ */
+/* $Id: pdo_stmt.c,v 1.210 2008/11/13 14:36:56 pajoye Exp $ */
 
 /* The PDO Statement Handle Class */
 
@@ -1804,9 +1804,9 @@
        error_count = zend_hash_num_elements(Z_ARRVAL_P(return_value));
 
        if (error_expected_count > error_count) {
-               error_count_diff = error_expected_count - error_count;
-               
                int current_index;
+
+               error_count_diff = error_expected_count - error_count;
                for (current_index = 0; current_index < error_count_diff; 
current_index++) {
                        add_next_index_null(return_value);
                }
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.155&r2=1.156&diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.155 php-src/ext/pdo/pdo_dbh.c:1.156
--- php-src/ext/pdo/pdo_dbh.c:1.155     Mon Nov 10 20:34:53 2008
+++ php-src/ext/pdo/pdo_dbh.c   Thu Nov 13 14:36:56 2008
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: pdo_dbh.c,v 1.155 2008/11/10 20:34:53 davidc Exp $ */
+/* $Id: pdo_dbh.c,v 1.156 2008/11/13 14:36:56 pajoye Exp $ */
 
 /* The PDO Database Handle Class */
 
@@ -1034,10 +1034,10 @@
         */
        error_count = zend_hash_num_elements(Z_ARRVAL_P(return_value));
        
-       if (error_expected_count > error_count) {
-               error_count_diff = error_expected_count - error_count;
-               
+       if (error_expected_count > error_count) {               
                int current_index;
+
+               error_count_diff = error_expected_count - error_count;
                for (current_index = 0; current_index > error_count_diff; 
current_index++) {
                        add_next_index_null(return_value);
                }



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