cvs: php4 /ext/mbstring mbstring.c

moriyoshi Mon Oct 21 06:47:42 2002 EDT Modified files: /php4/ext/mbstring mbstring.c Log: More style fixes... Index: php4/ext/mbstring/mbstring.c diff -u php4/ext/mbstring/mbstring.c:1.110 php4/ext/mbstring/mbstring.c:1.111 --- php4/ext/mbstring/mbstring.c:1.110 Sun Oct 20 22:39:53 2002 +++ php4/ext/mbstring/mbstring.c Mon Oct 21 06:47:41 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.110 2002/10/21 02:39:53 moriyoshi Exp $ */ +/* $Id: mbstring.c,v 1.111 2002/10/21 10:47:41 moriyoshi Exp $ */ /* * PHP4 Multibyte String module "mbstring" (currently only for Japanese) @@ -1304,7 +1304,7 @@ } else { name = mbfl_no2preferred_mime_name(no_encoding); if (name == NULL || *name == '\0') { - php_error_docref1(NULL TSRMLS_CC, Z_STRVAL_PP(arg1), E_WARNING, "no name for that encoding"); + php_error_docref1(NULL TSRMLS_CC, Z_STRVAL_PP(arg1), E_WARNING, "No MIME preferred name corresponding to that encoding"); RETVAL_FALSE; } else { RETVAL_STRING((char *)name, 1); @@ -1415,7 +1415,7 @@ mbfl_buffer_converter_illegal_mode(convd, MBSTRG(current_filter_illegal_mode) TSRMLS_CC); mbfl_buffer_converter_illegal_substchar(convd, MBSTRG(current_filter_illegal_substchar) TSRMLS_CC); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to create converter"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create converter"); } } @@ -1740,7 +1740,7 @@ mbfl_encoding_detector_delete(identd TSRMLS_CC); } if (from_encoding == mbfl_no_encoding_invalid) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to detect encoding"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to detect encoding"); from_encoding = mbfl_no_encoding_pass; } } @@ -1751,7 +1751,7 @@ mbfl_buffer_converter_illegal_mode(convd, MBSTRG(current_filter_illegal_mode) TSRMLS_CC); mbfl_buffer_converter_illegal_substchar(convd, MBSTRG(current_filter_illegal_substchar) TSRMLS_CC); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to create converter"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create converter"); } } @@ -2371,7 +2371,7 @@ convert_to_long_ex(arg2); from = Z_LVAL_PP(arg2); if (from < 0 || from > Z_STRLEN_PP(arg1)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "start not contained in string"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Start position is out of reange"); RETURN_FALSE; } @@ -2379,7 +2379,7 @@ width = Z_LVAL_PP(arg3); if (width < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "width has negative value"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Width is negative value"); RETURN_FALSE; } @@ -2447,13 +2447,13 @@ if (from_encoding != mbfl_no_encoding_invalid) { string.no_encoding = from_encoding; } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to detect character encoding"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to detect character encoding"); from_encoding = mbfl_no_encoding_pass; to_encoding = from_encoding; string.no_encoding = from_encoding; } } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "illegal character encoding specified"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal character encoding specified"); } if (list != NULL) { efree((void *)list); @@ -2463,7 +2463,7 @@ /* initialize converter */ convd = mbfl_buffer_converter_new(from_encoding, to_encoding, string.len TSRMLS_CC); if (convd == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to create character encoding converter"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create character encoding converter"); return NULL; } mbfl_buffer_converter_illegal_mode(convd, MBSTRG(current_filter_illegal_mode) TSRMLS_CC); @@ -2679,7 +2679,7 @@ break; } if (size <= 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "illegal argument"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal argument"); } } @@ -3053,7 +3053,7 @@ efree(stack); } if (from_encoding == mbfl_no_encoding_invalid) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to detect encoding"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to detect encoding"); from_encoding = mbfl_no_encoding_pass; } } @@ -3065,7 +3065,7 @@ if (from_encoding != mbfl_no_encoding_pass) { convd = mbfl_buffer_converter_new(from_encoding, to_encoding, 0 TSRMLS_CC); if (convd == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to create converter"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create converter"); RETURN_FALSE; } mbfl_buffer_converter_illegal_mode(convd, MBSTRG(current_filter_illegal_mode) TSRMLS_CC); @@ -3297,7 +3297,7 @@ if (Z_STRVAL_PP(argv[0])) { to = Z_STRVAL_PP(argv[0]); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "no to field"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Missing To: field"); err = 1; } @@ -3318,7 +3318,7 @@ subject = Z_STRVAL_PP(argv[1]); } } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "no subject field"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Missing Subject: field"); err = 1; } @@ -3340,7 +3340,7 @@ } } else { /* this is not really an error, so it is allowed. */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "no message string"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty message body"); message = NULL; }