cvs: php-src /ext/pdo_sqlite sqlite_statement.c

iliaa Wed May 20 15:06:20 2009 UTC Modified files: /php-src/ext/pdo_sqlite sqlite_statement.c Log: MFB: Re-introduce the Matteo's patch and combine default & text handling since they appear to be the same irregardless on notes inside sqlite3.h http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.34&r2=1.35&diff_format=u Index: php-src/ext/pdo_sqlite/sqlite_statement.c diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.34 php-src/ext/pdo_sqlite/sqlite_statement.c:1.35 --- php-src/ext/pdo_sqlite/sqlite_statement.c:1.34 Tue May 19 19:16:05 2009 +++ php-src/ext/pdo_sqlite/sqlite_statement.c Wed May 20 15:06:20 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sqlite_statement.c,v 1.34 2009/05/19 19:16:05 iliaa Exp $ */ +/* $Id: sqlite_statement.c,v 1.35 2009/05/20 15:06:20 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -262,16 +262,6 @@ *len = sqlite3_column_bytes(S->stmt, colno); return 1; - 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)--; - } -#endif - return 1; default: *ptr = (char*)sqlite3_column_text(S->stmt, colno); *len = sqlite3_column_bytes(S->stmt, colno);