diff options
author | Dmitry Stogov <dmitry@zend.com> | 2015-05-05 16:19:51 +0300 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2015-05-05 16:19:51 +0300 |
commit | 70c86732cb14bad0b2539a54c16e8e845f740117 (patch) | |
tree | 102cc8c5265f03b4f0bbd28cd13f29a101893480 /ext/pdo_sqlite/sqlite_statement.c | |
parent | 275afbacd11c2f4d0dac7d450ffdf500d5eab104 (diff) | |
download | php-git-70c86732cb14bad0b2539a54c16e8e845f740117.tar.gz |
Use zend_string to represent pdo_column_data.name and avoid duplication.
Diffstat (limited to 'ext/pdo_sqlite/sqlite_statement.c')
-rw-r--r-- | ext/pdo_sqlite/sqlite_statement.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/pdo_sqlite/sqlite_statement.c b/ext/pdo_sqlite/sqlite_statement.c index 29300c198a..f42ad05329 100644 --- a/ext/pdo_sqlite/sqlite_statement.c +++ b/ext/pdo_sqlite/sqlite_statement.c @@ -233,6 +233,7 @@ static int pdo_sqlite_stmt_fetch(pdo_stmt_t *stmt, static int pdo_sqlite_stmt_describe(pdo_stmt_t *stmt, int colno) { pdo_sqlite_stmt *S = (pdo_sqlite_stmt*)stmt->driver_data; + char *str; if(colno >= sqlite3_column_count(S->stmt)) { /* error invalid column */ @@ -240,8 +241,8 @@ static int pdo_sqlite_stmt_describe(pdo_stmt_t *stmt, int colno) return 0; } - stmt->columns[colno].name = estrdup(sqlite3_column_name(S->stmt, colno)); - stmt->columns[colno].namelen = strlen(stmt->columns[colno].name); + str = sqlite3_column_name(S->stmt, colno); + stmt->columns[colno].name = zend_string_init(str, strlen(str), 0); stmt->columns[colno].maxlen = 0xffffffff; stmt->columns[colno].precision = 0; |