cvs: php4 /ext/iconv iconv.c
| From: | Moriyoshi Koizumi | Date: | Wed, 30 Oct 2002 19:21:56 +0000 |
| Subject: | cvs: php4 /ext/iconv iconv.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-15666@lists.php.net to get a copy of this message | ||
moriyoshi Wed Oct 30 14:21:56 2002 EDT
Modified files:
/php4/ext/iconv iconv.c
Log:
Prevent unnecessary notices on success
Index: php4/ext/iconv/iconv.c
diff -u php4/ext/iconv/iconv.c:1.60 php4/ext/iconv/iconv.c:1.61
--- php4/ext/iconv/iconv.c:1.60 Tue Oct 29 14:09:27 2002
+++ php4/ext/iconv/iconv.c Wed Oct 30 14:21:56 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.60 2002/10/29 19:09:27 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.61 2002/10/30 19:21:56 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -320,9 +320,13 @@
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);