From: Moriyoshi Koizumi Date: Wed, 30 Oct 2002 19:21:56 +0000 (+0000) Subject: Prevent unnecessary notices on success X-Git-Tag: php-4.3.0RC1~402 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3e342012072f3f0e5d4488cd2d34d71db6f82e7;p=php Prevent unnecessary notices on success --- diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index e71158e636..1286a28f93 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -320,9 +320,13 @@ php_iconv_err_t php_iconv_string(const char *in_p, size_t in_len, static void _php_iconv_show_error(php_iconv_err_t err, const char *in_charset, const char *out_charset TSRMLS_DC) { switch (err) { + case PHP_ICONV_ERR_SUCCESS: + break; + case PHP_ICONV_ERR_CONVERTER: php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Cannot open converter"); break; + case PHP_ICONV_ERR_WRONG_CHARSET: php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Wrong charset, cannot convert from `%s' to `%s'", in_charset, out_charset);