indeyets Sat Jun 28 21:23:08 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mbstring mbstring.c php_mbregex.c
/php-src/ext/mbstring/tests mb_ereg2.phpt
mb_regex_encoding_error1.phpt
mb_regex_encoding_variation1.phpt
mb_substr_error1.phpt
mb_substr_variation1.phpt
mb_substr_variation2.phpt
Log:
updated to the new parameter-parsing api
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.9&r2=1.224.2.22.2.25.2.10&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.9
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.10
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.9 Sat Jun 28 18:04:19 2008
+++ php-src/ext/mbstring/mbstring.c Sat Jun 28 21:23:07 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.9 2008/06/28 18:04:19 indeyets Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.10 2008/06/28 21:23:07 indeyets Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -1293,12 +1293,17 @@
Sets the current detect_order or Return the current detect_order as a array
*/
PHP_FUNCTION(mb_detect_order)
{
- zval **arg1;
+ size_t argc = ZEND_NUM_ARGS();
+ zval *arg1;
int n, size;
enum mbfl_no_encoding *list, *entry;
char *name;
- if (ZEND_NUM_ARGS() == 0) {
+ if (zend_parse_parameters(argc TSRMLS_CC, "|z", &arg1) == FAILURE) {
+ return;
+ }
+
+ if (argc == 0) {
array_init(return_value);
entry = MBSTRG(current_detect_order_list);
n = MBSTRG(current_detect_order_list_size);
@@ -1310,12 +1315,12 @@
entry++;
n--;
}
- } else if (ZEND_NUM_ARGS() == 1 && zend_get_parameters_ex(1, &arg1) !=
FAILURE) {
+ } else {
list = NULL;
size = 0;
- switch (Z_TYPE_PP(arg1)) {
+ switch (Z_TYPE_P(arg1)) {
case IS_ARRAY:
- if (!php_mb_parse_encoding_array(*arg1, &list, &size, 0
TSRMLS_CC)) {
+ if (!php_mb_parse_encoding_array(arg1, &list, &size, 0
TSRMLS_CC)) {
if (list) {
efree(list);
}
@@ -1323,8 +1328,8 @@
}
break;
default:
- convert_to_string_ex(arg1);
- if (!php_mb_parse_encoding_list(Z_STRVAL_PP(arg1),
Z_STRLEN_PP(arg1), &list, &size, 0 TSRMLS_CC)) {
+ convert_to_string_ex(&arg1);
+ if (!php_mb_parse_encoding_list(Z_STRVAL_P(arg1),
Z_STRLEN_P(arg1), &list, &size, 0 TSRMLS_CC)) {
if (list) {
efree(list);
}
@@ -1332,18 +1337,17 @@
}
break;
}
+
if (list == NULL) {
- RETVAL_FALSE;
- } else {
- if (MBSTRG(current_detect_order_list)) {
- efree(MBSTRG(current_detect_order_list));
- }
- MBSTRG(current_detect_order_list) = list;
- MBSTRG(current_detect_order_list_size) = size;
- RETVAL_TRUE;
+ RETURN_FALSE;
}
- } else {
- WRONG_PARAM_COUNT;
+
+ if (MBSTRG(current_detect_order_list)) {
+ efree(MBSTRG(current_detect_order_list));
+ }
+ MBSTRG(current_detect_order_list) = list;
+ MBSTRG(current_detect_order_list_size) = size;
+ RETURN_TRUE;
}
}
/* }}} */
@@ -1352,52 +1356,56 @@
Sets the current substitute_character or returns the current
substitute_character */
PHP_FUNCTION(mb_substitute_character)
{
- zval **arg1;
+ zval *arg1;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z", &arg1) ==
FAILURE) {
+ return;
+ }
if (ZEND_NUM_ARGS() == 0) {
if (MBSTRG(current_filter_illegal_mode) ==
MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
- RETVAL_STRING("none", 1);
+ RETURN_STRING("none", 1);
} else if (MBSTRG(current_filter_illegal_mode) ==
MBFL_OUTPUTFILTER_ILLEGAL_MODE_LONG) {
- RETVAL_STRING("long", 1);
+ RETURN_STRING("long", 1);
} else if (MBSTRG(current_filter_illegal_mode) ==
MBFL_OUTPUTFILTER_ILLEGAL_MODE_ENTITY) {
- RETVAL_STRING("entity", 1);
+ RETURN_STRING("entity", 1);
} else {
- RETVAL_LONG(MBSTRG(current_filter_illegal_substchar));
+ RETURN_LONG(MBSTRG(current_filter_illegal_substchar));
}
- } else if (ZEND_NUM_ARGS() == 1 && zend_get_parameters_ex(1, &arg1) !=
FAILURE) {
+ } else {
RETVAL_TRUE;
- switch (Z_TYPE_PP(arg1)) {
+
+ switch (Z_TYPE_P(arg1)) {
case IS_STRING:
- if (strcasecmp("none", Z_STRVAL_PP(arg1)) == 0) {
+ if (strncasecmp("none", Z_STRVAL_P(arg1),
Z_STRLEN_P(arg1)) == 0) {
MBSTRG(current_filter_illegal_mode) =
MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE;
- } else if (strcasecmp("long", Z_STRVAL_PP(arg1)) == 0) {
+ } else if (strncasecmp("long", Z_STRVAL_P(arg1),
Z_STRLEN_P(arg1)) == 0) {
MBSTRG(current_filter_illegal_mode) =
MBFL_OUTPUTFILTER_ILLEGAL_MODE_LONG;
- } else if (strcasecmp("entity", Z_STRVAL_PP(arg1)) ==
0) {
+ } else if (strncasecmp("entity", Z_STRVAL_P(arg1),
Z_STRLEN_P(arg1)) == 0) {
MBSTRG(current_filter_illegal_mode) =
MBFL_OUTPUTFILTER_ILLEGAL_MODE_ENTITY;
} else {
- convert_to_long_ex(arg1);
- if (Z_LVAL_PP(arg1)< 0xffff && Z_LVAL_PP(arg1)>
0x0) {
+ convert_to_long_ex(&arg1);
+
+ if (Z_LVAL_P(arg1) < 0xffff && Z_LVAL_P(arg1) >
0x0) {
MBSTRG(current_filter_illegal_mode) =
MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR;
-
MBSTRG(current_filter_illegal_substchar) = Z_LVAL_PP(arg1);
+
MBSTRG(current_filter_illegal_substchar) = Z_LVAL_P(arg1);
} else {
php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Unknown character.");
- RETVAL_FALSE;
+ RETURN_FALSE;
}
}
break;
default:
- convert_to_long_ex(arg1);
- if (Z_LVAL_PP(arg1)< 0xffff && Z_LVAL_PP(arg1)> 0x0) {
+ convert_to_long_ex(&arg1);
+ if (Z_LVAL_P(arg1) < 0xffff && Z_LVAL_P(arg1) > 0x0) {
MBSTRG(current_filter_illegal_mode) =
MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR;
- MBSTRG(current_filter_illegal_substchar) =
Z_LVAL_PP(arg1);
+ MBSTRG(current_filter_illegal_substchar) =
Z_LVAL_P(arg1);
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Unknown character.");
- RETVAL_FALSE;
+ RETURN_FALSE;
}
break;
}
- } else {
- WRONG_PARAM_COUNT;
}
}
/* }}} */
@@ -2098,52 +2106,33 @@
Returns part of a string */
PHP_FUNCTION(mb_substr)
{
- zval **arg1, **arg2, **arg3, **arg4;
- int argc, from, len, mblen;
+ size_t argc = ZEND_NUM_ARGS();
+ char *str, *encoding;
+ long str_len, from, len, encoding_len;
+ int mblen;
mbfl_string string, result, *ret;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl|ls", &str,
&str_len, &from, &len, &encoding, &encoding_len) == FAILURE) {
+ return;
+ }
+
mbfl_string_init(&string);
string.no_language = MBSTRG(current_language);
string.no_encoding = MBSTRG(current_internal_encoding);
- argc = ZEND_NUM_ARGS();
- switch (argc) {
- case 2:
- if (zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
- break;
- case 3:
- if (zend_get_parameters_ex(3, &arg1, &arg2, &arg3) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
- break;
- case 4:
- if (zend_get_parameters_ex(4, &arg1, &arg2, &arg3, &arg4) ==
FAILURE) {
- WRONG_PARAM_COUNT;
- }
- convert_to_string_ex(arg4);
- string.no_encoding = mbfl_name2no_encoding(Z_STRVAL_PP(arg4));
+ if (argc == 4) {
+ string.no_encoding = mbfl_name2no_encoding(encoding);
if (string.no_encoding == mbfl_no_encoding_invalid) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown
encoding \"%s\"", Z_STRVAL_PP(arg4));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown
encoding \"%s\"", encoding);
RETURN_FALSE;
}
- break;
- default:
- WRONG_PARAM_COUNT;
}
- convert_to_string_ex(arg1);
- string.val = (unsigned char *)Z_STRVAL_PP(arg1);
- string.len = Z_STRLEN_PP(arg1);
-
- convert_to_long_ex(arg2);
- from = Z_LVAL_PP(arg2);
- if (argc >= 3) {
- convert_to_long_ex(arg3);
- len = Z_LVAL_PP(arg3);
- } else {
- len = Z_STRLEN_PP(arg1);
+ string.val = (unsigned char *)str;
+ string.len = str_len;
+
+ if (argc < 3) {
+ len = str_len;
}
/* measures length */
@@ -2178,11 +2167,11 @@
}
ret = mbfl_substr(&string, &result, from, len);
- if (ret != NULL) {
- RETVAL_STRINGL((char *)ret->val, ret->len, 0); /* the
string is already strdup()'ed */
- } else {
- RETVAL_FALSE;
+ if (NULL == ret) {
+ RETURN_FALSE;
}
+
+ RETURN_STRINGL((char *)ret->val, ret->len, 0); /* the string is already
strdup()'ed */
}
/* }}} */
@@ -2190,59 +2179,39 @@
Returns part of a string */
PHP_FUNCTION(mb_strcut)
{
- zval **arg1, **arg2, **arg3, **arg4;
- int argc, from, len;
+ size_t argc = ZEND_NUM_ARGS();
+ char *str, *encoding;
+ long str_len, from, len, encoding_len;
mbfl_string string, result, *ret;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl|ls", &str,
&str_len, &from, &len, &encoding, &encoding_len) == FAILURE) {
+ return;
+ }
+
mbfl_string_init(&string);
string.no_language = MBSTRG(current_language);
string.no_encoding = MBSTRG(current_internal_encoding);
- argc = ZEND_NUM_ARGS();
- switch (argc) {
- case 2:
- if (zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
- break;
- case 3:
- if (zend_get_parameters_ex(3, &arg1, &arg2, &arg3) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
- break;
- case 4:
- if (zend_get_parameters_ex(4, &arg1, &arg2, &arg3, &arg4) ==
FAILURE) {
- WRONG_PARAM_COUNT;
- }
- convert_to_string_ex(arg4);
- string.no_encoding = mbfl_name2no_encoding(Z_STRVAL_PP(arg4));
+ if (argc == 4) {
+ string.no_encoding = mbfl_name2no_encoding(encoding);
if (string.no_encoding == mbfl_no_encoding_invalid) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown
encoding \"%s\"", Z_STRVAL_PP(arg4));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown
encoding \"%s\"", encoding);
RETURN_FALSE;
}
- break;
- default:
- WRONG_PARAM_COUNT;
}
- convert_to_string_ex(arg1);
- string.val = Z_STRVAL_PP(arg1);
- string.len = Z_STRLEN_PP(arg1);
-
- convert_to_long_ex(arg2);
- from = Z_LVAL_PP(arg2);
- if (argc >= 3) {
- convert_to_long_ex(arg3);
- len = Z_LVAL_PP(arg3);
- } else {
- len = Z_STRLEN_PP(arg1);
+ string.val = str;
+ string.len = str_len;
+
+ if (argc < 3) {
+ len = str_len;
}
/* if "from" position is negative, count start position from the end
* of the string
*/
if (from < 0) {
- from = Z_STRLEN_PP(arg1) + from;
+ from = str_len + from;
if (from < 0) {
from = 0;
}
@@ -2252,25 +2221,26 @@
* needed to stop that many chars from the end of the string
*/
if (len < 0) {
- len = (Z_STRLEN_PP(arg1) - from) + len;
+ len = (str_len - from) + len;
if (len < 0) {
len = 0;
}
}
- if (from > Z_STRLEN_PP(arg1)) {
+ if (from > str_len) {
RETURN_FALSE;
}
- if (((unsigned) from + (unsigned) len) > Z_STRLEN_PP(arg1)) {
- len = Z_STRLEN_PP(arg1) - from;
+
+ if (((unsigned) from + (unsigned) len) > str_len) {
+ len = str_len - from;
}
ret = mbfl_strcut(&string, &result, from, len);
- if (ret != NULL) {
- RETVAL_STRINGL(ret->val, ret->len, 0); /* the string
is already strdup()'ed */
- } else {
- RETVAL_FALSE;
+ if (ret == NULL) {
+ RETURN_FALSE;
}
+
+ RETURN_STRINGL(ret->val, ret->len, 0); /* the string is already
strdup()'ed */
}
/* }}} */
@@ -2314,9 +2284,14 @@
PHP_FUNCTION(mb_strimwidth)
{
zval **arg1, **arg2, **arg3, **arg4, **arg5;
- int from, width;
+ char *str, *trimmarker, *encoding;
+ long str_len, from, width, trimmarker_len, encoding_len;
mbfl_string string, result, marker, *ret;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sll|ss", &str,
&str_len, &from, &width, &trimmarker, &trimmarker_len, &encoding,
&encoding_len) == FAILURE) {
+ return;
+ }
+
mbfl_string_init(&string);
mbfl_string_init(&marker);
string.no_language = MBSTRG(current_language);
@@ -2326,63 +2301,39 @@
marker.val = NULL;
marker.len = 0;
- switch (ZEND_NUM_ARGS()) {
- case 3:
- if (zend_get_parameters_ex(3, &arg1, &arg2, &arg3) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
- break;
- case 4:
- if (zend_get_parameters_ex(4, &arg1, &arg2, &arg3, &arg4) ==
FAILURE) {
- WRONG_PARAM_COUNT;
- }
- break;
- case 5:
- if (zend_get_parameters_ex(5, &arg1, &arg2, &arg3, &arg4,
&arg5) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
- convert_to_string_ex(arg5);
- string.no_encoding = marker.no_encoding =
mbfl_name2no_encoding(Z_STRVAL_PP(arg5));
+ if (ZEND_NUM_ARGS() == 5) {
+ string.no_encoding = marker.no_encoding =
mbfl_name2no_encoding(encoding);
if (string.no_encoding == mbfl_no_encoding_invalid) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown
encoding \"%s\"", Z_STRVAL_PP(arg5));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown
encoding \"%s\"", encoding);
RETURN_FALSE;
}
- break;
- default:
- WRONG_PARAM_COUNT;
}
- convert_to_string_ex(arg1);
- string.val = (unsigned char *)Z_STRVAL_PP(arg1);
- string.len = Z_STRLEN_PP(arg1);
-
- convert_to_long_ex(arg2);
- from = Z_LVAL_PP(arg2);
- if (from < 0 || from > Z_STRLEN_PP(arg1)) {
+ string.val = (unsigned char *)str;
+ string.len = str_len;
+
+ if (from < 0 || from > str_len) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Start position is
out of range");
RETURN_FALSE;
}
- convert_to_long_ex(arg3);
- width = Z_LVAL_PP(arg3);
-
if (width < 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Width is negative
value");
RETURN_FALSE;
}
if (ZEND_NUM_ARGS() >= 4) {
- convert_to_string_ex(arg4);
- marker.val = (unsigned char *)Z_STRVAL_PP(arg4);
- marker.len = Z_STRLEN_PP(arg4);
+ marker.val = (unsigned char *)trimmarker;
+ marker.len = trimmarker_len;
}
ret = mbfl_strimwidth(&string, &marker, &result, from, width);
- if (ret != NULL) {
- RETVAL_STRINGL((char *)ret->val, ret->len, 0); /* the
string is already strdup()'ed */
- } else {
- RETVAL_FALSE;
+
+ if (ret == NULL) {
+ RETURN_FALSE;
}
+
+ RETVAL_STRINGL((char *)ret->val, ret->len, 0); /* the string is already
strdup()'ed */
}
/* }}} */
@@ -2476,47 +2427,49 @@
Returns converted string in desired encoding */
PHP_FUNCTION(mb_convert_encoding)
{
- zval **arg_str, **arg_new, **arg_old;
+ char *arg_str, *arg_new;
+ long str_len, new_len;
+ zval *arg_old;
int i;
size_t size, l, n;
- char *_from_encodings, *ret, *s_free = NULL;
+ char *_from_encodings = NULL, *ret, *s_free = NULL;
zval **hash_entry;
HashTable *target_hash;
- _from_encodings = NULL;
- if (ZEND_NUM_ARGS() == 2) {
- if (zend_get_parameters_ex(2, &arg_str, &arg_new) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
- } else if (ZEND_NUM_ARGS() == 3) {
- if (zend_get_parameters_ex(3, &arg_str, &arg_new, &arg_old) ==
FAILURE) {
- WRONG_PARAM_COUNT;
- }
- switch (Z_TYPE_PP(arg_old)) {
- case IS_ARRAY:
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|z", &arg_str,
&str_len, &arg_new, &new_len, &arg_old) == FAILURE) {
+ return;
+ }
- target_hash = Z_ARRVAL_PP(arg_old);
+ if (ZEND_NUM_ARGS() == 3) {
+ switch (Z_TYPE_P(arg_old)) {
+ case IS_ARRAY:
+ target_hash = Z_ARRVAL_P(arg_old);
zend_hash_internal_pointer_reset(target_hash);
i = zend_hash_num_elements(target_hash);
_from_encodings = NULL;
+
while (i > 0) {
if (zend_hash_get_current_data(target_hash,
(void **) &hash_entry) == FAILURE) {
break;
}
- convert_to_string_ex(hash_entry);
+
+ convert_to_string_ex(hash_entry);
+
if ( _from_encodings) {
l = strlen(_from_encodings);
n = strlen(Z_STRVAL_PP(hash_entry));
_from_encodings =
erealloc(_from_encodings, l+n+2);
- strcpy(_from_encodings+l,",");
-
strcpy(_from_encodings+l+1,Z_STRVAL_PP(hash_entry));
+ strcpy(_from_encodings+l, ",");
+ strcpy(_from_encodings+l+1,
Z_STRVAL_PP(hash_entry));
} else {
_from_encodings =
estrdup(Z_STRVAL_PP(hash_entry));
}
+
zend_hash_move_forward(target_hash);
i--;
}
+
if (_from_encodings != NULL &&
!strlen(_from_encodings)) {
efree(_from_encodings);
_from_encodings = NULL;
@@ -2524,23 +2477,20 @@
s_free = _from_encodings;
break;
default:
- convert_to_string_ex(arg_old);
- _from_encodings = Z_STRVAL_PP(arg_old);
+ convert_to_string_ex(&arg_old);
+ _from_encodings = Z_STRVAL_P(arg_old);
break;
}
- } else {
- WRONG_PARAM_COUNT;
}
/* new encoding */
- convert_to_string_ex(arg_str);
- convert_to_string_ex(arg_new);
- ret = php_mb_convert_encoding( Z_STRVAL_PP(arg_str),
Z_STRLEN_PP(arg_str), Z_STRVAL_PP(arg_new), _from_encodings, &size TSRMLS_CC);
+ ret = php_mb_convert_encoding(arg_str, str_len, arg_new,
_from_encodings, &size TSRMLS_CC);
if (ret != NULL) {
RETVAL_STRINGL(ret, size, 0); /* the string is
already strdup()'ed */
} else {
RETVAL_FALSE;
}
+
if ( s_free) {
efree(s_free);
}
@@ -2620,35 +2570,27 @@
Encodings of the given string is returned (as a string) */
PHP_FUNCTION(mb_detect_encoding)
{
- zval **arg_str, **arg_list, **arg_strict;
+ char *str;
+ long str_len;
+ zend_bool strict=0;
+ zval *encoding_list;
+
mbfl_string string;
const char *ret;
enum mbfl_no_encoding *elist;
- int size, *list, strict = 0;
+ int size, *list;
- if (ZEND_NUM_ARGS() == 1) {
- if (zend_get_parameters_ex(1, &arg_str) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
- } else if (ZEND_NUM_ARGS() == 2) {
- if (zend_get_parameters_ex(2, &arg_str, &arg_list) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
- } else if (ZEND_NUM_ARGS() == 3) {
- if (zend_get_parameters_ex(3, &arg_str, &arg_list, &arg_strict)
== FAILURE) {
- WRONG_PARAM_COUNT;
- }
- } else {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|zb", &str,
&str_len, &encoding_list, &strict) == FAILURE) {
+ return;
}
/* make encoding list */
list = NULL;
size = 0;
- if (ZEND_NUM_ARGS() >= 2 && Z_STRVAL_PP(arg_list)) {
- switch (Z_TYPE_PP(arg_list)) {
+ if (ZEND_NUM_ARGS() >= 2 && Z_STRVAL_P(encoding_list)) {
+ switch (Z_TYPE_P(encoding_list)) {
case IS_ARRAY:
- if (!php_mb_parse_encoding_array(*arg_list, &list,
&size, 0 TSRMLS_CC)) {
+ if (!php_mb_parse_encoding_array(encoding_list, &list,
&size, 0 TSRMLS_CC)) {
if (list) {
efree(list);
size = 0;
@@ -2656,8 +2598,8 @@
}
break;
default:
- convert_to_string_ex(arg_list);
- if (!php_mb_parse_encoding_list(Z_STRVAL_PP(arg_list),
Z_STRLEN_PP(arg_list), &list, &size, 0 TSRMLS_CC)) {
+ convert_to_string_ex(&encoding_list);
+ if
(!php_mb_parse_encoding_list(Z_STRVAL_P(encoding_list),
Z_STRLEN_P(encoding_list), &list, &size, 0 TSRMLS_CC)) {
if (list) {
efree(list);
size = 0;
@@ -2670,11 +2612,7 @@
}
}
- if (ZEND_NUM_ARGS() == 3) {
- convert_to_long_ex(arg_strict);
- strict = Z_LVAL_PP(arg_strict);
- }
- else {
+ if (ZEND_NUM_ARGS() < 3) {
strict = MBSTRG(strict_detection);
}
@@ -2685,20 +2623,21 @@
size = MBSTRG(current_detect_order_list_size);
}
- convert_to_string_ex(arg_str);
mbfl_string_init(&string);
string.no_language = MBSTRG(current_language);
- string.val = (unsigned char *)Z_STRVAL_PP(arg_str);
- string.len = Z_STRLEN_PP(arg_str);
+ string.val = (unsigned char *)str;
+ string.len = str_len;
ret = mbfl_identify_encoding_name(&string, elist, size, strict);
+
if (list != NULL) {
efree((void *)list);
}
- if (ret != NULL) {
- RETVAL_STRING((char *)ret, 1);
- } else {
+
+ if (ret == NULL) {
RETVAL_FALSE;
}
+
+ RETVAL_STRING((char *)ret, 1);
}
/* }}} */
@@ -3249,32 +3188,30 @@
static void
php_mb_numericentity_exec(INTERNAL_FUNCTION_PARAMETERS, int type)
{
- zval **arg1, **arg2, **arg3, **hash_entry;
+ char *str, *encoding;
+ long str_len, encoding_len;
+ zval *zconvmap, **hash_entry;
HashTable *target_hash;
- int argc, i, *convmap, *mapelm, mapsize=0;
+ size_t argc = ZEND_NUM_ARGS();
+ int i, *convmap, *mapelm, mapsize=0;
mbfl_string string, result, *ret;
enum mbfl_no_encoding no_encoding;
- argc = ZEND_NUM_ARGS();
- if ((argc == 2 && zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) ||
- (argc == 3 && zend_get_parameters_ex(3, &arg1, &arg2, &arg3) ==
FAILURE) ||
- argc < 2 || argc > 3) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(argc TSRMLS_CC, "szs", &str, &str_len,
&zconvmap, &encoding, &encoding_len) == FAILURE) {
+ return;
}
- convert_to_string_ex(arg1);
mbfl_string_init(&string);
string.no_language = MBSTRG(current_language);
string.no_encoding = MBSTRG(current_internal_encoding);
- string.val = (unsigned char *)Z_STRVAL_PP(arg1);
- string.len = Z_STRLEN_PP(arg1);
+ string.val = (unsigned char *)str;
+ string.len = str_len;
/* encoding */
if (argc == 3) {
- convert_to_string_ex(arg3);
- no_encoding = mbfl_name2no_encoding(Z_STRVAL_PP(arg3));
+ no_encoding = mbfl_name2no_encoding(encoding);
if (no_encoding == mbfl_no_encoding_invalid) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown
encoding \"%s\"", Z_STRVAL_PP(arg3));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown
encoding \"%s\"", encoding);
RETURN_FALSE;
} else {
string.no_encoding = no_encoding;
@@ -3283,8 +3220,8 @@
/* conversion map */
convmap = NULL;
- if (Z_TYPE_PP(arg2) == IS_ARRAY){
- target_hash = Z_ARRVAL_PP(arg2);
+ if (Z_TYPE_P(zconvmap) == IS_ARRAY) {
+ target_hash = Z_ARRVAL_P(zconvmap);
zend_hash_internal_pointer_reset(target_hash);
i = zend_hash_num_elements(target_hash);
if (i > 0) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_mbregex.c?r1=1.53.2.1.2.4.2.4&r2=1.53.2.1.2.4.2.5&diff_format=u
Index: php-src/ext/mbstring/php_mbregex.c
diff -u php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.4
php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.5
--- php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.4 Sat Feb 16 11:46:03 2008
+++ php-src/ext/mbstring/php_mbregex.c Sat Jun 28 21:23:07 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mbregex.c,v 1.53.2.1.2.4.2.4 2008/02/16 11:46:03 hirokawa Exp $ */
+/* $Id: php_mbregex.c,v 1.53.2.1.2.4.2.5 2008/06/28 21:23:07 indeyets Exp $ */
#ifdef HAVE_CONFIG_H
@@ -487,29 +487,33 @@
Returns the current encoding for regex as a string. */
PHP_FUNCTION(mb_regex_encoding)
{
- zval **arg1;
+ size_t argc = ZEND_NUM_ARGS();
+ char *encoding;
+ long encoding_len;
OnigEncoding mbctype;
- if (ZEND_NUM_ARGS() == 0) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &encoding,
&encoding_len) == FAILURE) {
+ return;
+ }
+
+ if (argc == 0) {
const char *retval =
php_mb_regex_mbctype2name(MBSTRG(current_mbctype));
- if ( retval != NULL ) {
- RETVAL_STRING((char *)retval, 1);
- } else {
- RETVAL_FALSE;
+
+ if (retval == NULL) {
+ RETURN_FALSE;
}
- } else if (ZEND_NUM_ARGS() == 1 &&
- zend_get_parameters_ex(1, &arg1) != FAILURE) {
- convert_to_string_ex(arg1);
- mbctype = php_mb_regex_name2mbctype(Z_STRVAL_PP(arg1));
+
+ RETURN_STRING((char *)retval, 1);
+ } else if (argc == 1) {
+ mbctype = php_mb_regex_name2mbctype(encoding);
+
if (mbctype == ONIG_ENCODING_UNDEF) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown
encoding \"%s\"", Z_STRVAL_PP(arg1));
- RETVAL_FALSE;
- } else {
- MBSTRG(current_mbctype) = mbctype;
- RETVAL_TRUE;
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown
encoding \"%s\"", encoding);
+ RETURN_FALSE;
}
- } else {
- WRONG_PARAM_COUNT;
+
+ MBSTRG(current_mbctype) = mbctype;
+ RETURN_TRUE;
}
}
/* }}} */
@@ -940,37 +944,27 @@
static void
_php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAMETERS, int mode)
{
- zval **arg_pattern, **arg_options;
+ size_t argc = ZEND_NUM_ARGS();
+ char *arg_pattern, *arg_options;
+ long arg_pattern_len, arg_options_len;
int n, i, err, pos, len, beg, end, option;
OnigUChar *str;
OnigSyntaxType *syntax;
+ if (zend_parse_parameters(argc TSRMLS_CC, "|ss", &arg_pattern,
&arg_pattern_len, &arg_options, &arg_options_len) == FAILURE) {
+ return;
+ }
+
option = MBSTRG(regex_default_options);
- switch (ZEND_NUM_ARGS()) {
- case 0:
- break;
- case 1:
- if (zend_get_parameters_ex(1, &arg_pattern) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
- break;
- case 2:
- if (zend_get_parameters_ex(2, &arg_pattern, &arg_options) ==
FAILURE) {
- WRONG_PARAM_COUNT;
- }
- convert_to_string_ex(arg_options);
+
+ if (argc == 2) {
option = 0;
- _php_mb_regex_init_options(Z_STRVAL_PP(arg_options),
Z_STRLEN_PP(arg_options), &option, &syntax, NULL);
- break;
- default:
- WRONG_PARAM_COUNT;
- break;
+ _php_mb_regex_init_options(arg_options, arg_options_len,
&option, &syntax, NULL);
}
- if (ZEND_NUM_ARGS() > 0) {
- /* create regex pattern buffer */
- convert_to_string_ex(arg_pattern);
- if ((MBSTRG(search_re) =
php_mbregex_compile_pattern(Z_STRVAL_PP(arg_pattern), Z_STRLEN_PP(arg_pattern),
option, MBSTRG(current_mbctype), MBSTRG(regex_default_syntax) TSRMLS_CC)) ==
NULL) {
+ if (argc > 0) {
+ /* create regex pattern buffer */
+ if ((MBSTRG(search_re) =
php_mbregex_compile_pattern(arg_pattern, arg_pattern_len, option,
MBSTRG(current_mbctype), MBSTRG(regex_default_syntax) TSRMLS_CC)) == NULL) {
RETURN_FALSE;
}
}
@@ -1079,41 +1073,28 @@
Initialize string and regular expression for search. */
PHP_FUNCTION(mb_ereg_search_init)
{
- zval **arg_str, **arg_pattern, **arg_options;
+ size_t argc = ZEND_NUM_ARGS();
+ zval *arg_str;
+ char *arg_pattern, *arg_options;
+ long arg_pattern_len, arg_options_len;
OnigSyntaxType *syntax = NULL;
int option;
+ if (zend_parse_parameters(argc TSRMLS_CC, "z|ss", &arg_str,
&arg_pattern, &arg_pattern_len, &arg_options, &arg_options_len) == FAILURE) {
+ return;
+ }
+
option = MBSTRG(regex_default_options);
syntax = MBSTRG(regex_default_syntax);
- switch (ZEND_NUM_ARGS()) {
- case 1:
- if (zend_get_parameters_ex(1, &arg_str) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
- break;
- case 2:
- if (zend_get_parameters_ex(2, &arg_str, &arg_pattern) ==
FAILURE) {
- WRONG_PARAM_COUNT;
- }
- break;
- case 3:
- if (zend_get_parameters_ex(3, &arg_str, &arg_pattern,
&arg_options) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
- convert_to_string_ex(arg_options);
+
+ if (argc == 3) {
option = 0;
- _php_mb_regex_init_options(Z_STRVAL_PP(arg_options),
Z_STRLEN_PP(arg_options), &option, &syntax, NULL);
- break;
- default:
- WRONG_PARAM_COUNT;
- break;
+ _php_mb_regex_init_options(arg_options, arg_options_len,
&option, &syntax, NULL);
}
- convert_to_string_ex(arg_str);
- if (ZEND_NUM_ARGS() > 1) {
- /* create regex pattern buffer */
- convert_to_string_ex(arg_pattern);
- if ((MBSTRG(search_re) =
php_mbregex_compile_pattern(Z_STRVAL_PP(arg_pattern), Z_STRLEN_PP(arg_pattern),
option, MBSTRG(current_mbctype), syntax TSRMLS_CC)) == NULL) {
+ if (argc > 1) {
+ /* create regex pattern buffer */
+ if ((MBSTRG(search_re) =
php_mbregex_compile_pattern(arg_pattern, arg_pattern_len, option,
MBSTRG(current_mbctype), syntax TSRMLS_CC)) == NULL) {
RETURN_FALSE;
}
}
@@ -1123,7 +1104,7 @@
MBSTRG(search_str) = (zval *)NULL;
}
- MBSTRG(search_str) = *arg_str;
+ MBSTRG(search_str) = arg_str;
Z_ADDREF_P(MBSTRG(search_str));
SEPARATE_ZVAL_IF_NOT_REF(&MBSTRG(search_str));
@@ -1178,22 +1159,21 @@
Set search start position */
PHP_FUNCTION(mb_ereg_search_setpos)
{
- zval **arg_pos;
+ long position;
int n;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg_pos) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &position) ==
FAILURE) {
+ return;
}
- convert_to_long_ex(arg_pos);
- n = Z_LVAL_PP(arg_pos);
- if (n < 0 || (MBSTRG(search_str) != NULL &&
Z_TYPE_P(MBSTRG(search_str)) == IS_STRING && n >=
Z_STRLEN_P(MBSTRG(search_str)))) {
+
+ if (position < 0 || (MBSTRG(search_str) != NULL &&
Z_TYPE_P(MBSTRG(search_str)) == IS_STRING && position >=
Z_STRLEN_P(MBSTRG(search_str)))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Position is out of
range");
MBSTRG(search_pos) = 0;
- RETVAL_FALSE;
- } else {
- MBSTRG(search_pos) = n;
- RETVAL_TRUE;
+ RETURN_FALSE;
}
+
+ MBSTRG(search_pos) = position;
+ RETURN_TRUE;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_ereg2.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/ext/mbstring/tests/mb_ereg2.phpt
diff -u php-src/ext/mbstring/tests/mb_ereg2.phpt:1.1.2.2
php-src/ext/mbstring/tests/mb_ereg2.phpt:1.1.2.2.2.1
--- php-src/ext/mbstring/tests/mb_ereg2.phpt:1.1.2.2 Wed Oct 11 11:53:02 2006
+++ php-src/ext/mbstring/tests/mb_ereg2.phpt Sat Jun 28 21:23:08 2008
@@ -31,7 +31,7 @@
string(2) "-1"
}
-Notice: Array to string conversion in %s on line %d
+Warning: mbereg_search_init() expects parameter 3 to be string, array given in
%s on line %d
int(-1)
int(-1)
array(1) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_regex_encoding_error1.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/mbstring/tests/mb_regex_encoding_error1.phpt
diff -u php-src/ext/mbstring/tests/mb_regex_encoding_error1.phpt:1.1.4.2
php-src/ext/mbstring/tests/mb_regex_encoding_error1.phpt:1.1.4.3
--- php-src/ext/mbstring/tests/mb_regex_encoding_error1.phpt:1.1.4.2 Fri Feb
1 15:29:59 2008
+++ php-src/ext/mbstring/tests/mb_regex_encoding_error1.phpt Sat Jun 28
21:23:08 2008
@@ -31,6 +31,6 @@
-- Testing mb_regex_encoding() function with more than expected no. of
arguments --
-Warning: Wrong parameter count for mb_regex_encoding() in %s on line %d
+Warning: mb_regex_encoding() expects at most 1 parameter, 2 given in %s on
line %d
NULL
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_regex_encoding_variation1.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/mbstring/tests/mb_regex_encoding_variation1.phpt
diff -u php-src/ext/mbstring/tests/mb_regex_encoding_variation1.phpt:1.1.4.2
php-src/ext/mbstring/tests/mb_regex_encoding_variation1.phpt:1.1.4.3
--- php-src/ext/mbstring/tests/mb_regex_encoding_variation1.phpt:1.1.4.2
Fri Feb 1 15:29:59 2008
+++ php-src/ext/mbstring/tests/mb_regex_encoding_variation1.phpt Sat Jun
28 21:23:08 2008
@@ -210,6 +210,6 @@
-- Iteration 24 --
-Warning: mb_regex_encoding(): Unknown encoding "Resource id #%d" in %s on line
%d
-bool(false)
+Warning: mb_regex_encoding() expects parameter 1 to be string, resource given
in %s on line %d
+NULL
Done
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr_error1.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/mbstring/tests/mb_substr_error1.phpt
diff -u php-src/ext/mbstring/tests/mb_substr_error1.phpt:1.1.4.2
php-src/ext/mbstring/tests/mb_substr_error1.phpt:1.1.4.3
--- php-src/ext/mbstring/tests/mb_substr_error1.phpt:1.1.4.2 Fri Feb 1
15:29:59 2008
+++ php-src/ext/mbstring/tests/mb_substr_error1.phpt Sat Jun 28 21:23:08 2008
@@ -39,11 +39,11 @@
-- Testing mb_substr() function with more than expected no. of arguments --
-Warning: Wrong parameter count for mb_substr() in %s on line %d
+Warning: mb_substr() expects at most 4 parameters, 5 given in %s on line %d
NULL
-- Testing mb_substr() function with less than expected no. of arguments --
-Warning: Wrong parameter count for mb_substr() in %s on line %d
+Warning: mb_substr() expects at least 2 parameters, 1 given in %s on line %d
NULL
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr_variation1.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/mbstring/tests/mb_substr_variation1.phpt
diff -u php-src/ext/mbstring/tests/mb_substr_variation1.phpt:1.1.4.2
php-src/ext/mbstring/tests/mb_substr_variation1.phpt:1.1.4.3
--- php-src/ext/mbstring/tests/mb_substr_variation1.phpt:1.1.4.2 Fri Feb
1 15:29:59 2008
+++ php-src/ext/mbstring/tests/mb_substr_variation1.phpt Sat Jun 28
21:23:08 2008
@@ -175,5 +175,7 @@
string(0) ""
-- Iteration 24 --
-string(5) "Resou"
+
+Warning: mb_substr() expects parameter 1 to be string, resource given in %s on
line %d
+NULL
Done
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr_variation2.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/mbstring/tests/mb_substr_variation2.phpt
diff -u php-src/ext/mbstring/tests/mb_substr_variation2.phpt:1.1.4.2
php-src/ext/mbstring/tests/mb_substr_variation2.phpt:1.1.4.3
--- php-src/ext/mbstring/tests/mb_substr_variation2.phpt:1.1.4.2 Fri Feb
1 15:29:59 2008
+++ php-src/ext/mbstring/tests/mb_substr_variation2.phpt Sat Jun 28
21:23:08 2008
@@ -215,6 +215,6 @@
-- Iteration 24 --
-Warning: mb_substr(): Unknown encoding "Resource id #%d" in %s on line %d
-bool(false)
+Warning: mb_substr() expects parameter 4 to be string, resource given in %s on
line %d
+NULL
Done
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
