moriyoshi Tue Nov 11 14:57:49 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c
Log:
MFH(r-1.204): Compiler warning fix (patch by Joe Orton).
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.37
php-src/ext/mbstring/mbstring.c:1.142.2.38
--- php-src/ext/mbstring/mbstring.c:1.142.2.37 Thu Nov 6 10:41:36 2003
+++ php-src/ext/mbstring/mbstring.c Tue Nov 11 14:57:48 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.142.2.37 2003/11/06 15:41:36 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.142.2.38 2003/11/11 19:57:48 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -2565,7 +2565,7 @@
/* {{{ MBSTRING_API char *php_mb_convert_encoding() */
MBSTRING_API char * php_mb_convert_encoding(char *input, size_t length, char
*_to_encoding, char *_from_encodings, size_t *output_len TSRMLS_DC)
{
- mbfl_string string, result, *ret;
+ mbfl_string string, result, *ret = NULL;
enum mbfl_no_encoding from_encoding, to_encoding;
mbfl_buffer_converter *convd;
int size, *list;
@@ -3789,7 +3789,7 @@
{
mbfl_string string;
enum mbfl_no_encoding *elist;
- enum mbfl_no_encoding encoding;
+ enum mbfl_no_encoding encoding = mbfl_no_encoding_invalid;
mbfl_encoding_detector *identd = NULL;
int size, *list;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
