helly Wed Jun 25 19:21:10 2003 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
Fix a warning
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.61 php-src/ext/sqlite/sqlite.c:1.62
--- php-src/ext/sqlite/sqlite.c:1.61 Wed Jun 25 19:14:19 2003
+++ php-src/ext/sqlite/sqlite.c Wed Jun 25 19:21:10 2003
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.61 2003/06/25 23:14:19 iliaa Exp $
+ $Id: sqlite.c,v 1.62 2003/06/25 23:21:10 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -43,7 +43,7 @@
#include "ext/spl/spl_functions.h"
#endif
-#include "Zend/zend_default_classes.h"
+#include "zend_default_classes.h"
#ifndef safe_emalloc
# define safe_emalloc(a,b,c) emalloc((a)*(b)+(c))
@@ -935,7 +935,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.61 2003/06/25 23:14:19 iliaa Exp $");
+ php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION "
$Id: sqlite.c,v 1.62 2003/06/25 23:21:10 helly 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();
@@ -1693,7 +1693,7 @@
static void php_sqlite_fetch_string(struct php_sqlite_result *res, zend_bool
decode_binary, zval *return_value TSRMLS_DC)
{
const char **rowdata;
- char *decoded = NULL;
+ char *decoded;
int decoded_len;
/* check range of the row */
@@ -1723,6 +1723,9 @@
decoded = (char*)rowdata[0];
rowdata[0] = NULL;
}
+ } else {
+ decoded = NULL;
+ decoded_len = 0;
}
if (!res->buffered) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
