mbeccati                Thu May  7 23:29:55 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/pdo_sqlite     sqlite_statement.c 
    /php-src    NEWS 
  Log:
  MFH
  - Fixed bug #48185 removing no-op code
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.18.2.4.2.3.2.6&r2=1.18.2.4.2.3.2.7&diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.3.2.6 
php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.3.2.7
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.3.2.6  Wed Apr  1 
14:35:24 2009
+++ php-src/ext/pdo_sqlite/sqlite_statement.c   Thu May  7 23:29:54 2009
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: sqlite_statement.c,v 1.18.2.4.2.3.2.6 2009/04/01 14:35:24 indeyets Exp 
$ */
+/* $Id: sqlite_statement.c,v 1.18.2.4.2.3.2.7 2009/05/07 23:29:54 mbeccati Exp 
$ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -265,11 +265,6 @@
                case SQLITE3_TEXT:
                        *ptr = (char*)sqlite3_column_text(S->stmt, colno);
                        *len = sqlite3_column_bytes(S->stmt, colno);
-                       if (*len) {
-                               /* sqlite3.h says "the NUL terminator is 
included in the byte count
-                                * for TEXT values" */
-                               *len--;
-                       }
                        return 1;
                
                default:
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.590&r2=1.2027.2.547.2.965.2.591&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.590 
php-src/NEWS:1.2027.2.547.2.965.2.591
--- php-src/NEWS:1.2027.2.547.2.965.2.590       Thu May  7 16:56:18 2009
+++ php-src/NEWS        Thu May  7 23:29:54 2009
@@ -33,6 +33,8 @@
 - Added ability to throw exceptions from SQLite3 instead of warnings. (Scott)
 - Added startup notices for deprecated ini settings. (Kalle)
 
+- Fixed bug #48185 (warning: value computed is not used in
+  pdo_sqlite_stmt_get_col line 271). (Matteo)
 - Fixed bug #48087 (call_user_method() invalid free of arguments). (Felipe)
 - Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo)
 - Fixed bug #48034 (PHP crashes when script is 8192 (8KB) bytes long). (Dmitry)



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

Reply via email to