cvs: php4 /ext/iconv iconv.c

helly Tue Oct 29 06:56:47 2002 EDT Modified files: /php4/ext/iconv iconv.c Log: -php_error => php_error_docref Index: php4/ext/iconv/iconv.c diff -u php4/ext/iconv/iconv.c:1.58 php4/ext/iconv/iconv.c:1.59 --- php4/ext/iconv/iconv.c:1.58 Mon Oct 28 20:28:21 2002 +++ php4/ext/iconv/iconv.c Tue Oct 29 06:56:46 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iconv.c,v 1.58 2002/10/29 01:28:21 iliaa Exp $ */ +/* $Id: iconv.c,v 1.59 2002/10/29 11:56:46 helly Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -321,35 +321,29 @@ { switch (err) { case PHP_ICONV_ERR_CONVERTER: - php_error(E_NOTICE, "%s(): Cannot open converter", - get_active_function_name(TSRMLS_C)); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Cannot open converter"); break; case PHP_ICONV_ERR_WRONG_CHARSET: - php_error(E_NOTICE, "%s(): Wrong charset, cannot convert from %s' to %s'", - get_active_function_name(TSRMLS_C), + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Wrong charset, cannot convert from %s' to %s'", in_charset, out_charset); break; case PHP_ICONV_ERR_ILLEGAL_CHAR: - php_error(E_NOTICE, "%s(): Detected incomplete character in input string", - get_active_function_name(TSRMLS_C)); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Detected incomplete character in input string"); break; case PHP_ICONV_ERR_ILLEGAL_SEQ: - php_error(E_NOTICE, "%s(): Detected illegal character in input string", - get_active_function_name(TSRMLS_C)); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Detected illegal character in input string"); break; case PHP_ICONV_ERR_TOO_BIG: /* should not happen */ - php_error(E_WARNING, "%s(): Run out buffer", - get_active_function_name(TSRMLS_C)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Run out buffer"); break; default: /* other error */ - php_error(E_NOTICE, "%s(): Unknown error (%d)", - get_active_function_name(TSRMLS_C), errno); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unknown error (%d)", errno); break; } }