iliaa Tue May 19 19:15:18 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_sqlite sqlite_statement.c
Log:
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.3.2.8&r2=1.18.2.4.2.3.2.9&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.8
php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.3.2.9
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.3.2.8 Tue May 19
16:14:13 2009
+++ php-src/ext/pdo_sqlite/sqlite_statement.c Tue May 19 19:15:18 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sqlite_statement.c,v 1.18.2.4.2.3.2.8 2009/05/19 16:14:13 iliaa Exp $
*/
+/* $Id: sqlite_statement.c,v 1.18.2.4.2.3.2.9 2009/05/19 19:15:18 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -265,12 +265,13 @@
case SQLITE3_TEXT:
*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;
-
default:
*ptr = (char*)sqlite3_column_text(S->stmt, colno);
*len = sqlite3_column_bytes(S->stmt, colno);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
