Skip to content
This repository has been archived by the owner on Nov 25, 2020. It is now read-only.

Commit

Permalink
Replaced zend_parse_method_params with plain zpp
Browse files Browse the repository at this point in the history
  • Loading branch information
@cataphract
cataphract committed Jul 22, 2012
1 parent 376b05a commit a99ed41
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 29 deletions.
42 changes: 22 additions & 20 deletions breakiterator/breakiterator_methods.cpp
View file
Expand Up @@ -110,9 +110,9 @@ U_CFUNC PHP_FUNCTION(breakiter_create_title_instance)
U_CFUNC PHP_FUNCTION(breakiter_get_text) U_CFUNC PHP_FUNCTION(breakiter_get_text)
{ {
BREAKITER_METHOD_INIT_VARS; BREAKITER_METHOD_INIT_VARS;
object = getThis();


if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", if (zend_parse_parameters_none() == FAILURE) {
&object, BreakIterator_ce_ptr) == FAILURE) {
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
"breakiter_get_text: bad arguments", 0 TSRMLS_CC); "breakiter_get_text: bad arguments", 0 TSRMLS_CC);
RETURN_FALSE; RETURN_FALSE;
Expand All @@ -134,9 +134,10 @@ U_CFUNC PHP_FUNCTION(breakiter_set_text)
UText *ut = NULL; UText *ut = NULL;
zval **textzv; zval **textzv;
BREAKITER_METHOD_INIT_VARS; BREAKITER_METHOD_INIT_VARS;
object = getThis();


if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
&object, BreakIterator_ce_ptr, &text, &text_len) == FAILURE) { &text, &text_len) == FAILURE) {
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
"breakiter_set_text: bad arguments", 0 TSRMLS_CC); "breakiter_set_text: bad arguments", 0 TSRMLS_CC);
RETURN_FALSE; RETURN_FALSE;
Expand Down Expand Up @@ -178,9 +179,9 @@ static void _breakiter_no_args_ret_int32(
{ {
char *msg; char *msg;
BREAKITER_METHOD_INIT_VARS; BREAKITER_METHOD_INIT_VARS;
object = getThis();


if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", if (zend_parse_parameters_none() == FAILURE) {
&object, BreakIterator_ce_ptr) == FAILURE) {
spprintf(&msg, NULL, "%s: bad arguments", func_name); spprintf(&msg, NULL, "%s: bad arguments", func_name);
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, msg, 1 TSRMLS_CC); intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, msg, 1 TSRMLS_CC);
efree(msg); efree(msg);
Expand All @@ -202,9 +203,9 @@ static void _breakiter_int32_ret_int32(
char *msg; char *msg;
long arg; long arg;
BREAKITER_METHOD_INIT_VARS; BREAKITER_METHOD_INIT_VARS;
object = getThis();


if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &arg) == FAILURE) {
&object, BreakIterator_ce_ptr, &arg) == FAILURE) {
spprintf(&msg, NULL, "%s: bad arguments", func_name); spprintf(&msg, NULL, "%s: bad arguments", func_name);
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, msg, 1 TSRMLS_CC); intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, msg, 1 TSRMLS_CC);
efree(msg); efree(msg);
Expand Down Expand Up @@ -279,9 +280,9 @@ U_CFUNC PHP_FUNCTION(breakiter_next)
U_CFUNC PHP_FUNCTION(breakiter_current) U_CFUNC PHP_FUNCTION(breakiter_current)
{ {
BREAKITER_METHOD_INIT_VARS; BREAKITER_METHOD_INIT_VARS;
object = getThis();


if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", if (zend_parse_parameters_none() == FAILURE) {
&object, BreakIterator_ce_ptr) == FAILURE) {
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
"breakiter_current: bad arguments", 0 TSRMLS_CC); "breakiter_current: bad arguments", 0 TSRMLS_CC);
RETURN_FALSE; RETURN_FALSE;
Expand Down Expand Up @@ -312,9 +313,10 @@ U_CFUNC PHP_FUNCTION(breakiter_is_boundary)
{ {
long offset; long offset;
BREAKITER_METHOD_INIT_VARS; BREAKITER_METHOD_INIT_VARS;
object = getThis();


if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l",
&object, BreakIterator_ce_ptr, &offset) == FAILURE) { &offset) == FAILURE) {
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
"breakiter_is_boundary: bad arguments", 0 TSRMLS_CC); "breakiter_is_boundary: bad arguments", 0 TSRMLS_CC);
RETURN_FALSE; RETURN_FALSE;
Expand All @@ -338,9 +340,9 @@ U_CFUNC PHP_FUNCTION(breakiter_get_locale)
{ {
long locale_type; long locale_type;
BREAKITER_METHOD_INIT_VARS; BREAKITER_METHOD_INIT_VARS;
object = getThis();


if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &locale_type) == FAILURE) {
"Ol", &object, BreakIterator_ce_ptr, &locale_type) == FAILURE) {
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
"breakiter_get_locale: bad arguments", 0 TSRMLS_CC); "breakiter_get_locale: bad arguments", 0 TSRMLS_CC);
RETURN_FALSE; RETURN_FALSE;
Expand All @@ -365,9 +367,9 @@ U_CFUNC PHP_FUNCTION(breakiter_get_locale)
U_CFUNC PHP_FUNCTION(breakiter_get_parts_iterator) U_CFUNC PHP_FUNCTION(breakiter_get_parts_iterator)
{ {
BREAKITER_METHOD_INIT_VARS; BREAKITER_METHOD_INIT_VARS;
object = getThis();


if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", if (zend_parse_parameters_none() == FAILURE) {
&object, BreakIterator_ce_ptr) == FAILURE) {
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
"breakiter_get_parts_iterator: bad arguments", 0 TSRMLS_CC); "breakiter_get_parts_iterator: bad arguments", 0 TSRMLS_CC);
RETURN_FALSE; RETURN_FALSE;
Expand All @@ -381,9 +383,9 @@ U_CFUNC PHP_FUNCTION(breakiter_get_parts_iterator)
U_CFUNC PHP_FUNCTION(breakiter_get_error_code) U_CFUNC PHP_FUNCTION(breakiter_get_error_code)
{ {
BREAKITER_METHOD_INIT_VARS; BREAKITER_METHOD_INIT_VARS;
object = getThis();


if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", if (zend_parse_parameters_none() == FAILURE) {
&object, BreakIterator_ce_ptr) == FAILURE) {
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
"breakiter_get_error_code: bad arguments", 0 TSRMLS_CC); "breakiter_get_error_code: bad arguments", 0 TSRMLS_CC);
RETURN_FALSE; RETURN_FALSE;
Expand All @@ -401,9 +403,9 @@ U_CFUNC PHP_FUNCTION(breakiter_get_error_message)
{ {
const char* message = NULL; const char* message = NULL;
BREAKITER_METHOD_INIT_VARS; BREAKITER_METHOD_INIT_VARS;
object = getThis();


if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", if (zend_parse_parameters_none() == FAILURE) {
&object, BreakIterator_ce_ptr) == FAILURE) {
intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
"breakiter_get_error_message: bad arguments", 0 TSRMLS_CC ); "breakiter_get_error_message: bad arguments", 0 TSRMLS_CC );
RETURN_FALSE; RETURN_FALSE;
Expand Down
18 changes: 9 additions & 9 deletions breakiterator/rulebasedbreakiterator_methods.cpp
View file
Expand Up @@ -101,11 +101,11 @@ U_CFUNC PHP_METHOD(RuleBasedBreakIterator, __construct)
U_CFUNC PHP_FUNCTION(rbbi_get_rules) U_CFUNC PHP_FUNCTION(rbbi_get_rules)
{ {
BREAKITER_METHOD_INIT_VARS; BREAKITER_METHOD_INIT_VARS;
object = getThis();


if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", if (zend_parse_parameters_none() == FAILURE) {
&object, BreakIterator_ce_ptr) == FAILURE) {
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, 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; RETURN_FALSE;
} }


Expand All @@ -127,9 +127,9 @@ U_CFUNC PHP_FUNCTION(rbbi_get_rules)
U_CFUNC PHP_FUNCTION(rbbi_get_rule_status) U_CFUNC PHP_FUNCTION(rbbi_get_rule_status)
{ {
BREAKITER_METHOD_INIT_VARS; BREAKITER_METHOD_INIT_VARS;
object = getThis();


if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", if (zend_parse_parameters_none() == FAILURE) {
&object, BreakIterator_ce_ptr) == FAILURE) {
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
"rbbi_get_rule_status: bad arguments", 0 TSRMLS_CC); "rbbi_get_rule_status: bad arguments", 0 TSRMLS_CC);
RETURN_FALSE; RETURN_FALSE;
Expand All @@ -143,9 +143,9 @@ U_CFUNC PHP_FUNCTION(rbbi_get_rule_status)
U_CFUNC PHP_FUNCTION(rbbi_get_rule_status_vec) U_CFUNC PHP_FUNCTION(rbbi_get_rule_status_vec)
{ {
BREAKITER_METHOD_INIT_VARS; BREAKITER_METHOD_INIT_VARS;
object = getThis();


if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", if (zend_parse_parameters_none() == FAILURE) {
&object, BreakIterator_ce_ptr) == FAILURE) {
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
"rbbi_get_rule_status_vec: bad arguments", 0 TSRMLS_CC); "rbbi_get_rule_status_vec: bad arguments", 0 TSRMLS_CC);
RETURN_FALSE; RETURN_FALSE;
Expand Down Expand Up @@ -183,9 +183,9 @@ U_CFUNC PHP_FUNCTION(rbbi_get_rule_status_vec)
U_CFUNC PHP_FUNCTION(rbbi_get_binary_rules) U_CFUNC PHP_FUNCTION(rbbi_get_binary_rules)
{ {
BREAKITER_METHOD_INIT_VARS; BREAKITER_METHOD_INIT_VARS;
object = getThis();


if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", if (zend_parse_parameters_none() == FAILURE) {
&object, BreakIterator_ce_ptr) == FAILURE) {
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
"rbbi_get_binary_rules: bad arguments", 0 TSRMLS_CC); "rbbi_get_binary_rules: bad arguments", 0 TSRMLS_CC);
RETURN_FALSE; RETURN_FALSE;
Expand Down

0 comments on commit a99ed41

Please sign in to comment.