Commit: a4925fae9b89dcd7912dce5852b4170a978e1bd0 Author: Gustavo André dos Santos Lopes <cataphr...@php.net> Sun, 10 Jun 2012 00:23:09 +0200 Parents: afed66bb9efc0a8838f2061c4a3aa0befec0f98c Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a4925fae9b89dcd7912dce5852b4170a978e1bd0 Log: Replaced zend_parse_method_params with plain zpp Changed paths: M ext/intl/breakiterator/breakiterator_methods.cpp M ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp Diff: diff --git a/ext/intl/breakiterator/breakiterator_methods.cpp b/ext/intl/breakiterator/breakiterator_methods.cpp index 2855105..6777f90 100644 --- a/ext/intl/breakiterator/breakiterator_methods.cpp +++ b/ext/intl/breakiterator/breakiterator_methods.cpp @@ -110,9 +110,9 @@ U_CFUNC PHP_FUNCTION(breakiter_create_title_instance) U_CFUNC PHP_FUNCTION(breakiter_get_text) { BREAKITER_METHOD_INIT_VARS; + object = getThis(); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", - &object, BreakIterator_ce_ptr) == FAILURE) { + if (zend_parse_parameters_none() == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "breakiter_get_text: bad arguments", 0 TSRMLS_CC); RETURN_FALSE; @@ -134,9 +134,10 @@ U_CFUNC PHP_FUNCTION(breakiter_set_text) UText *ut = NULL; zval **textzv; BREAKITER_METHOD_INIT_VARS; + object = getThis(); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", - &object, BreakIterator_ce_ptr, &text, &text_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", + &text, &text_len) == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "breakiter_set_text: bad arguments", 0 TSRMLS_CC); RETURN_FALSE; @@ -178,9 +179,9 @@ static void _breakiter_no_args_ret_int32( { char *msg; BREAKITER_METHOD_INIT_VARS; + object = getThis(); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", - &object, BreakIterator_ce_ptr) == FAILURE) { + if (zend_parse_parameters_none() == FAILURE) { spprintf(&msg, NULL, "%s: bad arguments", func_name); intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, msg, 1 TSRMLS_CC); efree(msg); @@ -202,9 +203,9 @@ static void _breakiter_int32_ret_int32( char *msg; long arg; BREAKITER_METHOD_INIT_VARS; + object = getThis(); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", - &object, BreakIterator_ce_ptr, &arg) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &arg) == FAILURE) { spprintf(&msg, NULL, "%s: bad arguments", func_name); intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, msg, 1 TSRMLS_CC); efree(msg); @@ -279,9 +280,9 @@ U_CFUNC PHP_FUNCTION(breakiter_next) U_CFUNC PHP_FUNCTION(breakiter_current) { BREAKITER_METHOD_INIT_VARS; + object = getThis(); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", - &object, BreakIterator_ce_ptr) == FAILURE) { + if (zend_parse_parameters_none() == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "breakiter_current: bad arguments", 0 TSRMLS_CC); RETURN_FALSE; @@ -312,9 +313,10 @@ U_CFUNC PHP_FUNCTION(breakiter_is_boundary) { long offset; BREAKITER_METHOD_INIT_VARS; + object = getThis(); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", - &object, BreakIterator_ce_ptr, &offset) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", + &offset) == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "breakiter_is_boundary: bad arguments", 0 TSRMLS_CC); RETURN_FALSE; @@ -338,9 +340,9 @@ U_CFUNC PHP_FUNCTION(breakiter_get_locale) { long locale_type; BREAKITER_METHOD_INIT_VARS; + object = getThis(); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), - "Ol", &object, BreakIterator_ce_ptr, &locale_type) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &locale_type) == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "breakiter_get_locale: bad arguments", 0 TSRMLS_CC); RETURN_FALSE; @@ -365,9 +367,9 @@ U_CFUNC PHP_FUNCTION(breakiter_get_locale) U_CFUNC PHP_FUNCTION(breakiter_get_parts_iterator) { BREAKITER_METHOD_INIT_VARS; + object = getThis(); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", - &object, BreakIterator_ce_ptr) == FAILURE) { + if (zend_parse_parameters_none() == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "breakiter_get_parts_iterator: bad arguments", 0 TSRMLS_CC); RETURN_FALSE; @@ -381,9 +383,9 @@ U_CFUNC PHP_FUNCTION(breakiter_get_parts_iterator) U_CFUNC PHP_FUNCTION(breakiter_get_error_code) { BREAKITER_METHOD_INIT_VARS; + object = getThis(); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", - &object, BreakIterator_ce_ptr) == FAILURE) { + if (zend_parse_parameters_none() == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "breakiter_get_error_code: bad arguments", 0 TSRMLS_CC); RETURN_FALSE; @@ -401,9 +403,9 @@ U_CFUNC PHP_FUNCTION(breakiter_get_error_message) { const char* message = NULL; BREAKITER_METHOD_INIT_VARS; + object = getThis(); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", - &object, BreakIterator_ce_ptr) == FAILURE) { + if (zend_parse_parameters_none() == FAILURE) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "breakiter_get_error_message: bad arguments", 0 TSRMLS_CC ); RETURN_FALSE; diff --git a/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp b/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp index 85eceb3..4e96450 100644 --- a/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp +++ b/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp @@ -101,11 +101,11 @@ U_CFUNC PHP_METHOD(RuleBasedBreakIterator, __construct) U_CFUNC PHP_FUNCTION(rbbi_get_rules) { BREAKITER_METHOD_INIT_VARS; + object = getThis(); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", - &object, BreakIterator_ce_ptr) == FAILURE) { + if (zend_parse_parameters_none() == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, - "rbbi_hash_code: bad arguments", 0 TSRMLS_CC); + "rbbi_get_rules: bad arguments", 0 TSRMLS_CC); RETURN_FALSE; } @@ -127,9 +127,9 @@ U_CFUNC PHP_FUNCTION(rbbi_get_rules) U_CFUNC PHP_FUNCTION(rbbi_get_rule_status) { BREAKITER_METHOD_INIT_VARS; + object = getThis(); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", - &object, BreakIterator_ce_ptr) == FAILURE) { + if (zend_parse_parameters_none() == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "rbbi_get_rule_status: bad arguments", 0 TSRMLS_CC); RETURN_FALSE; @@ -143,9 +143,9 @@ U_CFUNC PHP_FUNCTION(rbbi_get_rule_status) U_CFUNC PHP_FUNCTION(rbbi_get_rule_status_vec) { BREAKITER_METHOD_INIT_VARS; + object = getThis(); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", - &object, BreakIterator_ce_ptr) == FAILURE) { + if (zend_parse_parameters_none() == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "rbbi_get_rule_status_vec: bad arguments", 0 TSRMLS_CC); RETURN_FALSE; @@ -183,9 +183,9 @@ U_CFUNC PHP_FUNCTION(rbbi_get_rule_status_vec) U_CFUNC PHP_FUNCTION(rbbi_get_binary_rules) { BREAKITER_METHOD_INIT_VARS; + object = getThis(); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", - &object, BreakIterator_ce_ptr) == FAILURE) { + if (zend_parse_parameters_none() == FAILURE) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "rbbi_get_binary_rules: bad arguments", 0 TSRMLS_CC); RETURN_FALSE; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
