cvs: php-src /ext/sqlite sqlite.c
| From: | Antony Dovgal | Date: | Tue, 18 Oct 2005 14:50:22 +0000 |
| Subject: | cvs: php-src /ext/sqlite sqlite.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34660@lists.php.net to get a copy of this message | ||
tony2001 Tue Oct 18 10:50:22 2005 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
nuke unused var and silence warnings
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.173&r2=1.174&ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.173 php-src/ext/sqlite/sqlite.c:1.174
--- php-src/ext/sqlite/sqlite.c:1.173 Mon Oct 17 10:29:20 2005
+++ php-src/ext/sqlite/sqlite.c Tue Oct 18 10:50:20 2005
@@ -17,7 +17,7 @@
| Marcus Boerger <helly@php.net> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.173 2005/10/17 14:29:20 iliaa Exp $
+ $Id: sqlite.c,v 1.174 2005/10/18 14:50:20 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1126,7 +1126,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite support", "enabled");
- php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id:
sqlite.c,v 1.173 2005/10/17 14:29:20 iliaa Exp $");
+ php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id:
sqlite.c,v 1.174 2005/10/18 14:50:20 tony2001 Exp $");
php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
php_info_print_table_end();
@@ -1433,7 +1433,7 @@
{
const char **rowdata, **colnames;
int ret, i, base;
- char *errtext = NULL, *colname;
+ char *errtext = NULL;
next_row:
ret = sqlite_step(rres->vm, &rres->ncolumns, &rowdata, &colnames);
@@ -1869,7 +1869,7 @@
zend_convert_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &u_str, &u_len,
(char*)rowdata[j], strlen((char*)rowdata[j]), &status);
ZVAL_UNICODEL(decoded, u_str, u_len, 0);
if (!buffered) {
- efree(rowdata[j]);
+ efree((char *)rowdata[j]);
}
} else {
ZVAL_STRING(decoded, (char*)rowdata[j], buffered);
@@ -1957,7 +1957,7 @@
zend_convert_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &u_str, &u_len,
(char*)rowdata[j], strlen((char*)rowdata[j]), &status);
RETVAL_UNICODEL(u_str, u_len, 0);
if (!res->buffered) {
- efree(rowdata[j]);
+ efree((char *)rowdata[j]);
rowdata[j] = NULL;
}
} else {