Skip to content

Commit 8213494

Browse files
author
Moriyoshi Koizumi
committed
style keisatsu :)
1 parent cee696d commit 8213494

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

‎ext/mbstring/mbstring.c

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,7 +1001,7 @@ PHP_FUNCTION(mb_language)
10011001
convert_to_string_ex(arg1);
10021002
no_language = mbfl_name2no_language(Z_STRVAL_PP(arg1));
10031003
if (no_language == mbfl_no_language_invalid) {
1004-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown language \"%s\"", Z_STRVAL_PP(arg1));
1004+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown language \"%s\"", Z_STRVAL_PP(arg1));
10051005
RETURN_FALSE;
10061006
} else {
10071007
MBSTRG(current_language) = no_language;
@@ -1034,7 +1034,7 @@ PHP_FUNCTION(mb_internal_encoding)
10341034
convert_to_string_ex(arg1);
10351035
no_encoding = mbfl_name2no_encoding(Z_STRVAL_PP(arg1));
10361036
if (no_encoding == mbfl_no_encoding_invalid) {
1037-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown encoding \"%s\"", Z_STRVAL_PP(arg1));
1037+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", Z_STRVAL_PP(arg1));
10381038
RETURN_FALSE;
10391039
} else {
10401040
MBSTRG(current_internal_encoding) = no_encoding;
@@ -1162,7 +1162,7 @@ PHP_FUNCTION(mb_http_output)
11621162
convert_to_string_ex(arg1);
11631163
no_encoding = mbfl_name2no_encoding(Z_STRVAL_PP(arg1));
11641164
if (no_encoding == mbfl_no_encoding_invalid) {
1165-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown encoding \"%s\"", Z_STRVAL_PP(arg1));
1165+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", Z_STRVAL_PP(arg1));
11661166
RETURN_FALSE;
11671167
} else {
11681168
MBSTRG(current_http_output_encoding) = no_encoding;
@@ -1264,7 +1264,7 @@ PHP_FUNCTION(mb_substitute_character)
12641264
MBSTRG(current_filter_illegal_mode) = MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR;
12651265
MBSTRG(current_filter_illegal_substchar) = Z_LVAL_PP(arg1);
12661266
} else {
1267-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown character.");
1267+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown character.");
12681268
RETVAL_FALSE;
12691269
}
12701270
}
@@ -1275,7 +1275,7 @@ PHP_FUNCTION(mb_substitute_character)
12751275
MBSTRG(current_filter_illegal_mode) = MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR;
12761276
MBSTRG(current_filter_illegal_substchar) = Z_LVAL_PP(arg1);
12771277
} else {
1278-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown character.");
1278+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown character.");
12791279
RETVAL_FALSE;
12801280
}
12811281
break;
@@ -1299,7 +1299,7 @@ PHP_FUNCTION(mb_preferred_mime_name)
12991299
convert_to_string_ex(arg1);
13001300
no_encoding = mbfl_name2no_encoding(Z_STRVAL_PP(arg1));
13011301
if (no_encoding == mbfl_no_encoding_invalid) {
1302-
php_error_docref1(NULL TSRMLS_CC, Z_STRVAL_PP(arg1), E_WARNING, "unknown encoding");
1302+
php_error_docref1(NULL TSRMLS_CC, Z_STRVAL_PP(arg1), E_WARNING, "Unknown encoding");
13031303
RETVAL_FALSE;
13041304
} else {
13051305
name = mbfl_no2preferred_mime_name(no_encoding);
@@ -1944,7 +1944,7 @@ PHP_FUNCTION(mb_strlen)
19441944
convert_to_string_ex(arg2);
19451945
string.no_encoding = mbfl_name2no_encoding(Z_STRVAL_PP(arg2));
19461946
if(string.no_encoding == mbfl_no_encoding_invalid) {
1947-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown encoding \"%s\"", Z_STRVAL_PP(arg2));
1947+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", Z_STRVAL_PP(arg2));
19481948
RETURN_FALSE;
19491949
}
19501950
}
@@ -1997,7 +1997,7 @@ PHP_FUNCTION(mb_strpos)
19971997
convert_to_string_ex(arg4);
19981998
haystack.no_encoding = needle.no_encoding = mbfl_name2no_encoding(Z_STRVAL_PP(arg4));
19991999
if(haystack.no_encoding == mbfl_no_encoding_invalid) {
2000-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown encoding \"%s\"", Z_STRVAL_PP(arg4));
2000+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", Z_STRVAL_PP(arg4));
20012001
RETURN_FALSE;
20022002
}
20032003
break;
@@ -2009,11 +2009,11 @@ PHP_FUNCTION(mb_strpos)
20092009
convert_to_string_ex(arg2);
20102010

20112011
if (offset < 0 || offset > Z_STRLEN_PP(arg1)) {
2012-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "offset not contained in string");
2012+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset is out of range");
20132013
RETURN_FALSE;
20142014
}
20152015
if (Z_STRLEN_PP(arg2) == 0) {
2016-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "empty needle");
2016+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty needle");
20172017
RETURN_FALSE;
20182018
}
20192019
haystack.val = Z_STRVAL_PP(arg1);
@@ -2029,16 +2029,16 @@ PHP_FUNCTION(mb_strpos)
20292029
case 1:
20302030
break;
20312031
case 2:
2032-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "needle has not positive length.");
2032+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Needle has not positive length.");
20332033
break;
20342034
case 4:
2035-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown encoding or conversion error.");
2035+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding or conversion error.");
20362036
break;
20372037
case 8:
2038-
php_error_docref(NULL TSRMLS_CC, E_NOTICE," argument is empty.");
2038+
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Argument is empty.");
20392039
break;
20402040
default:
2041-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown error in mb_strpos.");
2041+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error in mb_strpos.");
20422042
break;
20432043
}
20442044
RETVAL_FALSE;
@@ -2075,7 +2075,7 @@ PHP_FUNCTION(mb_strrpos)
20752075
convert_to_string_ex(arg3);
20762076
haystack.no_encoding = needle.no_encoding = mbfl_name2no_encoding(Z_STRVAL_PP(arg3));
20772077
if(haystack.no_encoding == mbfl_no_encoding_invalid) {
2078-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown encoding \"%s\"", Z_STRVAL_PP(arg3));
2078+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", Z_STRVAL_PP(arg3));
20792079
RETURN_FALSE;
20802080
}
20812081
break;
@@ -2086,11 +2086,11 @@ PHP_FUNCTION(mb_strrpos)
20862086
convert_to_string_ex(arg1);
20872087
convert_to_string_ex(arg2);
20882088
if (Z_STRLEN_PP(arg1) <= 0) {
2089-
php_error_docref(NULL TSRMLS_CC, E_WARNING,"empty haystack");
2089+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty haystack");
20902090
RETURN_FALSE;
20912091
}
20922092
if (Z_STRLEN_PP(arg2) <= 0) {
2093-
php_error_docref(NULL TSRMLS_CC, E_WARNING,"empty needle");
2093+
php_error_docref(NULL TSRMLS_CC, E_WARNING,"Empty needle");
20942094
RETURN_FALSE;
20952095
}
20962096
haystack.val = Z_STRVAL_PP(arg1);
@@ -2139,7 +2139,7 @@ PHP_FUNCTION(mb_substr)
21392139
convert_to_string_ex(arg4);
21402140
string.no_encoding = mbfl_name2no_encoding(Z_STRVAL_PP(arg4));
21412141
if (string.no_encoding == mbfl_no_encoding_invalid) {
2142-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown encoding \"%s\"", Z_STRVAL_PP(arg4));
2142+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", Z_STRVAL_PP(arg4));
21432143
RETURN_FALSE;
21442144
}
21452145
break;
@@ -2228,7 +2228,7 @@ PHP_FUNCTION(mb_strcut)
22282228
convert_to_string_ex(arg4);
22292229
string.no_encoding = mbfl_name2no_encoding(Z_STRVAL_PP(arg4));
22302230
if (string.no_encoding == mbfl_no_encoding_invalid) {
2231-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown encoding \"%s\"", Z_STRVAL_PP(arg4));
2231+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", Z_STRVAL_PP(arg4));
22322232
RETURN_FALSE;
22332233
}
22342234
break;
@@ -2305,7 +2305,7 @@ PHP_FUNCTION(mb_strwidth)
23052305
convert_to_string_ex(arg2);
23062306
string.no_encoding = mbfl_name2no_encoding(Z_STRVAL_PP(arg2));
23072307
if(string.no_encoding == mbfl_no_encoding_invalid) {
2308-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown encoding \"%s\"", Z_STRVAL_PP(arg2));
2308+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", Z_STRVAL_PP(arg2));
23092309
RETURN_FALSE;
23102310
}
23112311
}
@@ -2356,7 +2356,7 @@ PHP_FUNCTION(mb_strimwidth)
23562356
convert_to_string_ex(arg5);
23572357
string.no_encoding = marker.no_encoding = mbfl_name2no_encoding(Z_STRVAL_PP(arg5));
23582358
if (string.no_encoding == mbfl_no_encoding_invalid) {
2359-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown encoding \"%s\"", Z_STRVAL_PP(arg5));
2359+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", Z_STRVAL_PP(arg5));
23602360
RETURN_FALSE;
23612361
}
23622362
break;
@@ -2417,7 +2417,7 @@ PHPAPI char * php_mb_convert_encoding(char *input, size_t length, char *_to_enco
24172417
if (_to_encoding && strlen(_to_encoding)) {
24182418
to_encoding = mbfl_name2no_encoding(_to_encoding);
24192419
if (to_encoding == mbfl_no_encoding_invalid) {
2420-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown encoding \"%s\"", _to_encoding);
2420+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", _to_encoding);
24212421
return NULL;
24222422
}
24232423
} else {
@@ -2728,7 +2728,7 @@ PHP_FUNCTION(mb_encode_mimeheader)
27282728
convert_to_string_ex(argv[1]);
27292729
charset = mbfl_name2no_encoding(Z_STRVAL_PP(argv[1]));
27302730
if (charset == mbfl_no_encoding_invalid) {
2731-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown encoding \"%s\"", Z_STRVAL_PP(argv[1]));
2731+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", Z_STRVAL_PP(argv[1]));
27322732
RETURN_FALSE;
27332733
}
27342734
} else {
@@ -2906,7 +2906,7 @@ PHP_FUNCTION(mb_convert_kana)
29062906
convert_to_string_ex(arg3);
29072907
no_encoding = mbfl_name2no_encoding(Z_STRVAL_PP(arg3));
29082908
if (no_encoding == mbfl_no_encoding_invalid) {
2909-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown encoding \"%s\"", Z_STRVAL_PP(arg3));
2909+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", Z_STRVAL_PP(arg3));
29102910
RETURN_FALSE;
29112911
} else {
29122912
string.no_encoding = no_encoding;
@@ -2955,7 +2955,7 @@ PHP_FUNCTION(mb_convert_variables)
29552955
convert_to_string_ex(args[0]);
29562956
to_encoding = mbfl_name2no_encoding(Z_STRVAL_PP(args[0]));
29572957
if (to_encoding == mbfl_no_encoding_invalid) {
2958-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown encoding \"%s\"", Z_STRVAL_PP(args[0]));
2958+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", Z_STRVAL_PP(args[0]));
29592959
efree((void *)args);
29602960
RETURN_FALSE;
29612961
}
@@ -3184,7 +3184,7 @@ php_mbstr_numericentity_exec(INTERNAL_FUNCTION_PARAMETERS, int type)
31843184
convert_to_string_ex(arg3);
31853185
no_encoding = mbfl_name2no_encoding(Z_STRVAL_PP(arg3));
31863186
if (no_encoding == mbfl_no_encoding_invalid) {
3187-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unknown encoding \"%s\"", Z_STRVAL_PP(arg3));
3187+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding \"%s\"", Z_STRVAL_PP(arg3));
31883188
RETURN_FALSE;
31893189
} else {
31903190
string.no_encoding = no_encoding;

0 commit comments

Comments
 (0)