Remove unused is_constructor arguments

diff --git a/ext/intl/collator/collator_create.c b/ext/intl/collator/collator_create.c
index e5bc724b48a35d3f2fdde13d838c7b69dba6714c..2ce92419c293e3018c214698217954ef8a702080 100644 (file)
--- a/ext/intl/collator/collator_create.c
+++ b/ext/intl/collator/collator_create.c
@@ -25,7 +25,7 @@
 #include "intl_data.h"
 
 /* {{{ */
-static int collator_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_constructor)
+static int collator_ctor(INTERNAL_FUNCTION_PARAMETERS)
 {
        const char*      locale;
        size_t           locale_len = 0;
@@ -61,7 +61,7 @@ static int collator_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_constructor)
 PHP_FUNCTION( collator_create )
 {
        object_init_ex( return_value, Collator_ce_ptr );
-       if (collator_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0) == FAILURE) {
+       if (collator_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU) == FAILURE) {
                zval_ptr_dtor(return_value);
                RETURN_NULL();
        }
@@ -77,7 +77,7 @@ PHP_METHOD( Collator, __construct )
 
        zend_replace_error_handling(EH_THROW, IntlException_ce_ptr, &error_handling);
        return_value = ZEND_THIS;
-       if (collator_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1) == FAILURE) {
+       if (collator_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU) == FAILURE) {
                if (!EG(exception)) {
                        zend_throw_exception(IntlException_ce_ptr, "Constructor failed", 0);
                }

diff --git a/ext/intl/dateformat/dateformat_create.cpp b/ext/intl/dateformat/dateformat_create.cpp
index 73d8d8c356ed0f772594ad1f27b4e1e583b28039..529e7e7d5881fe1970cc45ed4b9a9ae3052014f7 100644 (file)
--- a/ext/intl/dateformat/dateformat_create.cpp
+++ b/ext/intl/dateformat/dateformat_create.cpp
@@ -45,7 +45,7 @@ extern "C" {
         UDAT_PATTERN == (i))
 
 /* {{{ */
-static int datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_constructor)
+static int datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
 {
        zval            *object;
        const char      *locale_str;
@@ -189,7 +189,7 @@ error:
 U_CFUNC PHP_FUNCTION( datefmt_create )
 {
     object_init_ex( return_value, IntlDateFormatter_ce_ptr );
-       if (datefmt_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0) == FAILURE) {
+       if (datefmt_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU) == FAILURE) {
                zval_ptr_dtor(return_value);
                RETURN_NULL();
        }
@@ -207,7 +207,7 @@ U_CFUNC PHP_METHOD( IntlDateFormatter, __construct )
        /* return_value param is being changed, therefore we will always return
         * NULL here */
        return_value = ZEND_THIS;
-       if (datefmt_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1) == FAILURE) {
+       if (datefmt_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU) == FAILURE) {
                if (!EG(exception)) {
                        zend_string *err = intl_error_get_message(NULL);
                        zend_throw_exception(IntlException_ce_ptr, ZSTR_VAL(err), intl_error_get_code(NULL));

diff --git a/ext/intl/formatter/formatter_main.c b/ext/intl/formatter/formatter_main.c
index 959fcd71dde20176f3999712babf7891b19042bd..15536bb4e142a3e4935c61042de460c16428ccdd 100644 (file)
--- a/ext/intl/formatter/formatter_main.c
+++ b/ext/intl/formatter/formatter_main.c
@@ -25,7 +25,7 @@
 #include "intl_convert.h"
 
 /* {{{ */
-static int numfmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_constructor)
+static int numfmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
 {
        const char* locale;
        char*       pattern = NULL;
@@ -76,7 +76,7 @@ static int numfmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_constructor)
 PHP_FUNCTION( numfmt_create )
 {
        object_init_ex( return_value, NumberFormatter_ce_ptr );
-       if (numfmt_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0) == FAILURE) {
+       if (numfmt_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU) == FAILURE) {
                zval_ptr_dtor(return_value);
                RETURN_NULL();
        }
@@ -92,7 +92,7 @@ PHP_METHOD( NumberFormatter, __construct )
 
        zend_replace_error_handling(EH_THROW, IntlException_ce_ptr, &error_handling);
        return_value = ZEND_THIS;
-       if (numfmt_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1) == FAILURE) {
+       if (numfmt_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU) == FAILURE) {
                if (!EG(exception)) {
                        zend_throw_exception(IntlException_ce_ptr, "Constructor failed", 0);
                }

diff --git a/ext/intl/msgformat/msgformat.c b/ext/intl/msgformat/msgformat.c
index dd4420a6ad3d61c082689d17cae49782963d74d8..63f452f4f333d84e28ad5d1c3e447d45b6dc5e01 100644 (file)
--- a/ext/intl/msgformat/msgformat.c
+++ b/ext/intl/msgformat/msgformat.c
@@ -27,7 +27,7 @@
 #include "intl_convert.h"
 
 /* {{{ */
-static int msgfmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_constructor)
+static int msgfmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
 {
        const char* locale;
        char*       pattern;
@@ -95,7 +95,7 @@ static int msgfmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_constructor)
 PHP_FUNCTION( msgfmt_create )
 {
        object_init_ex( return_value, MessageFormatter_ce_ptr );
-       if (msgfmt_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0) == FAILURE) {
+       if (msgfmt_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU) == FAILURE) {
                zval_ptr_dtor(return_value);
                RETURN_NULL();
        }
@@ -111,7 +111,7 @@ PHP_METHOD( MessageFormatter, __construct )
 
        zend_replace_error_handling(EH_THROW, IntlException_ce_ptr, &error_handling);
        return_value = ZEND_THIS;
-       if (msgfmt_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1) == FAILURE) {
+       if (msgfmt_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU) == FAILURE) {
                if (!EG(exception)) {
                        zend_throw_exception(IntlException_ce_ptr, "Constructor failed", 0);
                }

diff --git a/ext/intl/resourcebundle/resourcebundle_class.c b/ext/intl/resourcebundle/resourcebundle_class.c
index 6dc2ae16e34308b0659ac21b6f8310c27463e1f0..34dc379189c6cef45e527ee2cfeaba82e8a8b54f 100644 (file)
--- a/ext/intl/resourcebundle/resourcebundle_class.c
+++ b/ext/intl/resourcebundle/resourcebundle_class.c
@@ -75,7 +75,7 @@ static zend_object *ResourceBundle_object_create( zend_class_entry *ce )
 /* }}} */
 
 /* {{{ ResourceBundle_ctor */
-static int resourcebundle_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_constructor)
+static int resourcebundle_ctor(INTERNAL_FUNCTION_PARAMETERS)
 {
        const char *bundlename;
        size_t          bundlename_len = 0;
@@ -150,7 +150,7 @@ PHP_METHOD( ResourceBundle, __construct )
 
        zend_replace_error_handling(EH_THROW, IntlException_ce_ptr, &error_handling);
        return_value = ZEND_THIS;
-       if (resourcebundle_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1) == FAILURE) {
+       if (resourcebundle_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU) == FAILURE) {
                if (!EG(exception)) {
                        zend_throw_exception(IntlException_ce_ptr, "Constructor failed", 0);
                }
@@ -165,7 +165,7 @@ proto ResourceBundle resourcebundle_create( string $locale [, string $bundlename
 PHP_FUNCTION( resourcebundle_create )
 {
        object_init_ex( return_value, ResourceBundle_ce_ptr );
-       if (resourcebundle_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0) == FAILURE) {
+       if (resourcebundle_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU) == FAILURE) {
                zval_ptr_dtor(return_value);
                RETURN_NULL();
        }