clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unify error messages

Browse Source
This commit is contained in:
Derick Rethans 2002-07-19 07:18:16 +00:00
parent eb14d0f8e7
commit 7409f1cfd4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ext/iconv/iconv.c
View File

@ -175,7 +175,7 @@ static int php_iconv_string(const char *in_p, size_t in_len,
if (cd == (iconv_t)(-1)) { if (cd == (iconv_t)(-1)) {
*err = PHP_ICONV_UNKNOWN; *err = PHP_ICONV_UNKNOWN;
php_error(E_WARNING, "%s(): unknown error, unable to convert from `%s' to `%s'", php_error(E_WARNING, "%s(): Unknown error, unable to convert from `%s' to `%s'",
get_active_function_name(TSRMLS_C), in_charset, out_charset); get_active_function_name(TSRMLS_C), in_charset, out_charset);
efree(out_buffer); efree(out_buffer);
return FAILURE; return FAILURE;
@ -211,11 +211,11 @@ static int php_iconv_string(const char *in_p, size_t in_len,
if (cd == (iconv_t)(-1)) { if (cd == (iconv_t)(-1)) {
if (errno == EINVAL) { if (errno == EINVAL) {
*err = PHP_ICONV_WRONG_CHARSET; *err = PHP_ICONV_WRONG_CHARSET;
php_error(E_NOTICE, "%s(): wrong charset, cannot convert from `%s' to `%s'", php_error(E_NOTICE, "%s(): Wrong charset, cannot convert from `%s' to `%s'",
get_active_function_name(TSRMLS_C), in_charset, out_charset); get_active_function_name(TSRMLS_C), in_charset, out_charset);
} else { } else {
*err = PHP_ICONV_CONVERTER; *err = PHP_ICONV_CONVERTER;
php_error(E_NOTICE, "%s(): cannot open converter", php_error(E_NOTICE, "%s(): Cannot open converter",
get_active_function_name(TSRMLS_C)); get_active_function_name(TSRMLS_C));
} }
return FAILURE; return FAILURE;
@ -252,24 +252,24 @@ static int php_iconv_string(const char *in_p, size_t in_len,
if (result == (size_t)(-1)) { if (result == (size_t)(-1)) {
switch (errno) { switch (errno) {
case EINVAL: case EINVAL:
php_error(E_NOTICE, "%s(): detected incomplete character in input string", php_error(E_NOTICE, "%s(): Detected incomplete character in input string",
get_active_function_name(TSRMLS_C)); get_active_function_name(TSRMLS_C));
*err = PHP_ICONV_ILLEGAL_CHAR; *err = PHP_ICONV_ILLEGAL_CHAR;
break; break;
case EILSEQ: case EILSEQ:
php_error(E_NOTICE, "%s(): detected illegal character in input string", php_error(E_NOTICE, "%s(): Detected illegal character in input string",
get_active_function_name(TSRMLS_C)); get_active_function_name(TSRMLS_C));
*err = PHP_ICONV_ILLEGAL_SEQ; *err = PHP_ICONV_ILLEGAL_SEQ;
break; break;
case E2BIG: case E2BIG:
/* should not happen */ /* should not happen */
php_error(E_WARNING, "%s(): run out buffer", php_error(E_WARNING, "%s(): Run out buffer",
get_active_function_name(TSRMLS_C)); get_active_function_name(TSRMLS_C));
*err = PHP_ICONV_TOO_BIG; *err = PHP_ICONV_TOO_BIG;
break; break;
default: default:
/* other error */ /* other error */
php_error(E_NOTICE, "%s(): unknown error (%d)", php_error(E_NOTICE, "%s(): Unknown error (%d)",
get_active_function_name(TSRMLS_C), errno); get_active_function_name(TSRMLS_C), errno);
*err = PHP_ICONV_UNKNOWN; *err = PHP_ICONV_UNKNOWN;
efree(out_buf); efree(out_buf);