iliaa Tue Dec 23 12:05:44 2003 EDT
Modified files:
/php-src/ext/iconv iconv.c
Log:
Fixed compiler warnings.
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.110 php-src/ext/iconv/iconv.c:1.111
--- php-src/ext/iconv/iconv.c:1.110 Sun Dec 21 20:30:00 2003
+++ php-src/ext/iconv/iconv.c Tue Dec 23 12:05:43 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.110 2003/12/22 01:30:00 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.111 2003/12/23 17:05:43 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1241,11 +1241,11 @@
const char *csname = NULL;
size_t csname_len;
const char *encoded_text = NULL;
- size_t encoded_text_len;
+ size_t encoded_text_len = 0;
const char *encoded_word = NULL;
const char *spaces = NULL;
- php_iconv_enc_scheme_t enc_scheme;
+ php_iconv_enc_scheme_t enc_scheme = {0};
if (next_pos != NULL) {
*next_pos = NULL;
@@ -1537,6 +1537,9 @@
case
PHP_ICONV_ENC_SCHEME_QPRINT:
decoded_text = (char
*)php_quot_print_decode((unsigned char*)encoded_text, (int)encoded_text_len,
&decoded_text_len, 1);
break;
+ default:
+ decoded_text = NULL;
+ break;
}
if (decoded_text == NULL) {
@@ -2058,7 +2061,7 @@
int charset_len;
long mode = 0;
- php_iconv_err_t err;
+ php_iconv_err_t err = {0};
charset = ICONVG(internal_encoding);
@@ -2072,10 +2075,10 @@
while (encoded_str_len > 0) {
smart_str decoded_header = {0};
- char *header_name;
- size_t header_name_len;
+ char *header_name = NULL;
+ size_t header_name_len = 0;
char *header_value = NULL;
- size_t header_value_len;
+ size_t header_value_len = 0;
char *p, *limit;
const char *next_pos;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
