projects / packages / php.git / blame
| Commit | Line | Data |
|---|---|---|
| 3ced716c JB |
1 | --- php-4.3.4RC3/ext/mbstring/mbstring.c.orig 2003-10-26 08:47:42.000000000 +0100 |
| 2 | +++ php-4.3.4RC3/ext/mbstring/mbstring.c 2003-10-30 23:16:43.042175552 +0100 | |
| 3 | @@ -1357,7 +1357,7 @@ | |
| 4 | size = 0; | |
| 5 | switch (Z_TYPE_PP(arg1)) { | |
| 6 | case IS_ARRAY: | |
| 7 | - if (!php_mb_parse_encoding_array(*arg1, &list, &size, 0)) { | |
| 8 | + if (!php_mb_parse_encoding_array(*arg1, &list, &size, 0 TSRMLS_CC)) { | |
| 9 | if (list) { | |
| 10 | efree(list); | |
| 11 | } | |
| 12 | @@ -1887,7 +1887,7 @@ | |
| 13 | convd = mbfl_buffer_converter_new(from_encoding, to_encoding, 0); | |
| 14 | if (convd != NULL) { | |
| 15 | mbfl_buffer_converter_illegal_mode(convd, MBSTRG(current_filter_illegal_mode)); | |
| 16 | - mbfl_buffer_converter_illegal_substchar(convd, MBSTRG(current_filter_illegal_substchar) TSRMLS_CC); | |
| 17 | + mbfl_buffer_converter_illegal_substchar(convd, MBSTRG(current_filter_illegal_substchar)); | |
| 18 | } else { | |
| 19 | php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create converter"); | |
| 20 | } | |
| 21 | @@ -2832,7 +2832,7 @@ | |
| 22 | if (ZEND_NUM_ARGS() >= 2 && Z_STRVAL_PP(arg_list)) { | |
| 23 | switch (Z_TYPE_PP(arg_list)) { | |
| 24 | case IS_ARRAY: | |
| 25 | - if (!php_mb_parse_encoding_array(*arg_list, &list, &size, 0)) { | |
| 26 | + if (!php_mb_parse_encoding_array(*arg_list, &list, &size, 0 TSRMLS_CC)) { | |
| 27 | if (list) { | |
| 28 | efree(list); | |
| 29 | size = 0; | |
| 30 | @@ -3135,7 +3135,7 @@ | |
| 31 | elistsz = 0; | |
| 32 | switch (Z_TYPE_PP(args[1])) { | |
| 33 | case IS_ARRAY: | |
| 34 | - php_mb_parse_encoding_array(*args[1], &elist, &elistsz, 0); | |
| 35 | + php_mb_parse_encoding_array(*args[1], &elist, &elistsz, 0 TSRMLS_CC); | |
| 36 | break; | |
| 37 | default: | |
| 38 | convert_to_string_ex(args[1]); | |
| 39 | @@ -3841,7 +3841,7 @@ | |
| 40 | string.no_language = MBSTRG(current_language); | |
| 41 | string.val = (char*)arg_string; | |
| 42 | string.len = arg_length; | |
| 43 | - encoding = mbfl_identify_encoding_no(&string, elist, size TSRMLS_CC); | |
| 44 | + encoding = mbfl_identify_encoding_no(&string, elist, size); | |
| 45 | ||
| 46 | if (encoding != mbfl_no_encoding_invalid) { | |
| 47 | MBSTRG(http_input_identify) = encoding; |