iliaa           Tue May 19 16:14:46 2009 UTC

  Modified files:              
    /php-src/ext/pdo_sqlite     sqlite_statement.c 
  Log:
  
  MFB: Revert faulty warning fix
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.32&r2=1.33&diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.32 
php-src/ext/pdo_sqlite/sqlite_statement.c:1.33
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.32      Thu May  7 23:04:02 2009
+++ php-src/ext/pdo_sqlite/sqlite_statement.c   Tue May 19 16:14:46 2009
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: sqlite_statement.c,v 1.32 2009/05/07 23:04:02 mbeccati Exp $ */
+/* $Id: sqlite_statement.c,v 1.33 2009/05/19 16:14:46 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -265,6 +265,10 @@
                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--; /* do not remove this, even though it 
generates a warning */
+                       }
                        return 1;
                
                default:



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

Reply via email to