diff options
| author | Alexey Zakhlestin <indeyets@php.net> | 2009-04-01 14:35:24 +0000 |
|---|---|---|
| committer | Alexey Zakhlestin <indeyets@php.net> | 2009-04-01 14:35:24 +0000 |
| commit | 114e354048705e0bf9ec399e193cd36d8b24f7a9 (patch) | |
| tree | 1e28dd83fc2aa525851397a46c981024e931b3d1 /ext/pdo_sqlite | |
| parent | e1cb53f5ec8be62b9d95372cc253a136682e29c8 (diff) | |
| download | php-git-114e354048705e0bf9ec399e193cd36d8b24f7a9.tar.gz | |
MFH: reverted previous patch, using explicit cast instead
Diffstat (limited to 'ext/pdo_sqlite')
| -rw-r--r-- | ext/pdo_sqlite/sqlite_statement.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/ext/pdo_sqlite/sqlite_statement.c b/ext/pdo_sqlite/sqlite_statement.c index eca6845d25..933bb107a2 100644 --- a/ext/pdo_sqlite/sqlite_statement.c +++ b/ext/pdo_sqlite/sqlite_statement.c @@ -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 |