iliaa Tue May 19 19:20:01 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo_sqlite sqlite_statement.c
Log:
MFB: The \0 removal is only needed prior to 3.4.0
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.18.2.4.2.6&r2=1.18.2.4.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.6
php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.7
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.6 Tue May 19
16:14:37 2009
+++ php-src/ext/pdo_sqlite/sqlite_statement.c Tue May 19 19:20:01 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sqlite_statement.c,v 1.18.2.4.2.6 2009/05/19 16:14:37 iliaa Exp $ */
+/* $Id: sqlite_statement.c,v 1.18.2.4.2.7 2009/05/19 19:20:01 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -244,10 +244,12 @@
default:
*ptr = (char*)sqlite3_column_text(S->stmt, colno);
*len = sqlite3_column_bytes(S->stmt, colno);
+#if SQLITE_VERSION_NUMBER < 3004000
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 */
+ (*len)--;
}
+#endif
return 1;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
