archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

MFH: reverted previous patch, using explicit cast instead

Browse source
This commit is contained in:
Alexey Zakhlestin 2009-04-01 14:35:24 +00:00
parent e1cb53f5ec
commit 114e354048
1 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
ext/pdo_sqlite/sqlite_statement.c
View file

@ -282,9 +282,7 @@ static int pdo_sqlite_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, unsi
static int pdo_sqlite_stmt_col_meta(pdo_stmt_t *stmt, long colno, zval *return_value TSRMLS_DC)
{
pdo_sqlite_stmt *S = (pdo_sqlite_stmt*)stmt->driver_data;
const char *_str;
size_t _str_len;
char *str;
const char *str;
zval *flags;
if (!S->stmt) {
@ -320,21 +318,15 @@ static int pdo_sqlite_stmt_col_meta(pdo_stmt_t *stmt, long colno, zval *return_v
break;
}
_str = sqlite3_column_decltype(S->stmt, colno);
_str_len = strlen(_str);
if (_str) {
str = emalloc(_str_len);
strcpy(str, _str);
add_assoc_string(return_value, "sqlite:decl_type", str, 1);
str = sqlite3_column_decltype(S->stmt, colno);
if (str) {
add_assoc_string(return_value, "sqlite:decl_type", (char *)str, 1);
}
#ifdef SQLITE_ENABLE_COLUMN_METADATA
_str = sqlite3_column_table_name(S->stmt, colno);
_str_len = strlen(_str);
if (_str) {
str = emalloc(_str_len);
strcpy(str, _str);
add_assoc_string(return_value, "table", str, 1);
str = sqlite3_column_table_name(S->stmt, colno);
if (str) {
add_assoc_string(return_value, "table", (char *)str, 1);
}
#endif