From: Alexey Zakhlestin <indeyets@php.net>
Date: Wed, 1 Apr 2009 14:34:21 +0000 (+0000)
Subject: reverted previous patch, using explicit cast instead
X-Git-Tag: php-5.4.0alpha1~191^2~4001
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b22d40c6186abcdb02b212b0ce10dc5c22e8f10;p=php

reverted previous patch, using explicit cast instead
---

diff --git a/ext/pdo_sqlite/sqlite_statement.c b/ext/pdo_sqlite/sqlite_statement.c
index 88cef6a8e1..ed838d0469 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