Cleanup return values when parameter parsing is unsuccessful

diff --git a/ext/com_dotnet/com_com.c b/ext/com_dotnet/com_com.c
index 90972b93df314a77f82549da71fd215f25579af3..2d3f6c8e5cb3623c82010c1e9495a1c57e6fffc5 100644 (file)
--- a/ext/com_dotnet/com_com.c
+++ b/ext/com_dotnet/com_com.c
@@ -792,7 +792,7 @@ PHP_FUNCTION(com_message_pump)
        DWORD result;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &timeoutms) == FAILURE)
-               RETURN_FALSE;
+               return;
 
        php_com_initialize();
        result = MsgWaitForMultipleObjects(0, NULL, FALSE, (DWORD)timeoutms, QS_ALLINPUT);

diff --git a/ext/curl/curl_file.c b/ext/curl/curl_file.c
index 3241a8e31bd2fb326419423a97276710059de8e5..d08d77fb516b78952385f27411526a4e23c3d8cb 100644 (file)
--- a/ext/curl/curl_file.c
+++ b/ext/curl/curl_file.c
@@ -73,9 +73,7 @@ static void curlfile_get_property(char *name, size_t name_len, INTERNAL_FUNCTION
 {
        zval *res, rv;
 
-       if (zend_parse_parameters_none() == FAILURE) {
-               return;
-       }
+       ZEND_PARSE_PARAMETERS_NONE();
        res = zend_read_property(curl_CURLFile_class, ZEND_THIS, name, name_len, 1, &rv);
        ZVAL_COPY_DEREF(return_value, res);
 }

diff --git a/ext/curl/multi.c b/ext/curl/multi.c
index bbed3fe1f25929caf5aaa43e3001268e3440f3de..45995f6ac8eccd88ff9897ca7ac0c5c3139ababf 100644 (file)
--- a/ext/curl/multi.c
+++ b/ext/curl/multi.c
@@ -53,9 +53,7 @@ PHP_FUNCTION(curl_multi_init)
 {
        php_curlm *mh;
 
-       if (zend_parse_parameters_none() == FAILURE) {
-               return;
-       }
+       ZEND_PARSE_PARAMETERS_NONE();
 
        mh = ecalloc(1, sizeof(php_curlm));
        mh->multi = curl_multi_init();

diff --git a/ext/curl/share.c b/ext/curl/share.c
index 2814d0b822589d4989a926b0bc5d4fb45d64dd31..32dfa893d49595c996e47e13857678c4c433f3f5 100644 (file)
--- a/ext/curl/share.c
+++ b/ext/curl/share.c
@@ -36,9 +36,7 @@ PHP_FUNCTION(curl_share_init)
 {
        php_curlsh *sh;
 
-       if (zend_parse_parameters_none() == FAILURE) {
-               return;
-       }
+       ZEND_PARSE_PARAMETERS_NONE();
 
        sh = ecalloc(1, sizeof(php_curlsh));
 

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 6e878063eb2eb9937981a432c45715b5b028e541..bc0b68886317d7ca8d259e9d0cd47c46161601b2 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -1424,9 +1424,7 @@ PHP_FUNCTION(gmstrftime)
    Return current UNIX timestamp */
 PHP_FUNCTION(time)
 {
-       if (zend_parse_parameters_none() == FAILURE) {
-               return;
-       }
+       ZEND_PARSE_PARAMETERS_NONE();
 
        RETURN_LONG((zend_long)php_time());
 }
@@ -4321,9 +4319,7 @@ PHP_METHOD(DatePeriod, getStartDate)
        php_period_obj   *dpobj;
        php_date_obj     *dateobj;
 
-       if (zend_parse_parameters_none() == FAILURE) {
-               return;
-       }
+       ZEND_PARSE_PARAMETERS_NONE();
 
        dpobj = Z_PHPPERIOD_P(ZEND_THIS);
 
@@ -4348,9 +4344,7 @@ PHP_METHOD(DatePeriod, getEndDate)
         php_period_obj   *dpobj;
         php_date_obj     *dateobj;
 
-        if (zend_parse_parameters_none() == FAILURE) {
-                return;
-        }
+        ZEND_PARSE_PARAMETERS_NONE();
 
         dpobj = Z_PHPPERIOD_P(ZEND_THIS);
 
@@ -4379,9 +4373,7 @@ PHP_METHOD(DatePeriod, getDateInterval)
        php_period_obj   *dpobj;
        php_interval_obj *diobj;
 
-       if (zend_parse_parameters_none() == FAILURE) {
-               return;
-       }
+       ZEND_PARSE_PARAMETERS_NONE();
 
        dpobj = Z_PHPPERIOD_P(ZEND_THIS);
 
@@ -4399,9 +4391,7 @@ PHP_METHOD(DatePeriod, getRecurrences)
 {
        php_period_obj   *dpobj;
 
-       if (zend_parse_parameters_none() == FAILURE) {
-               return;
-       }
+       ZEND_PARSE_PARAMETERS_NONE();
 
        dpobj = Z_PHPPERIOD_P(ZEND_THIS);
 
@@ -4546,9 +4536,7 @@ PHP_FUNCTION(date_default_timezone_set)
 PHP_FUNCTION(date_default_timezone_get)
 {
        timelib_tzinfo *default_tz;
-       if (zend_parse_parameters_none() == FAILURE) {
-               return;
-       }
+       ZEND_PARSE_PARAMETERS_NONE();
 
        default_tz = get_timezone_info();
        RETVAL_STRING(default_tz->name);

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index a24b70ecd395a8cf41e60b6639736ef40362ed30..ad7ba2e7935c8b6712fcc50dd7ab6f53fb17d851 100644 (file)
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -1048,7 +1048,7 @@ PHP_FUNCTION(dba_key_split)
                }
        }
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &key, &key_len) == FAILURE) {
-               RETURN_BOOL(0);
+               return;
        }
        array_init(return_value);
        if (key[0] == '[' && (name = strchr(key, ']')) != NULL) {
@@ -1204,7 +1204,7 @@ PHP_FUNCTION(dba_handlers)
        zend_bool full_info = 0;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "|b", &full_info) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        array_init(return_value);
@@ -1231,7 +1231,7 @@ PHP_FUNCTION(dba_list)
        dba_info *info;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        array_init(return_value);

diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c
index 48457e3168b6ec8bcdaedea6aea991a8f8d991dd..27a9da4476b68d2ef57df5fc21af12cda6029a5b 100644 (file)
--- a/ext/fileinfo/fileinfo.c
+++ b/ext/fileinfo/fileinfo.c
@@ -243,7 +243,7 @@ PHP_FUNCTION(finfo_open)
        zend_error_handling zeh;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "|lp", &options, &file, &file_len) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        if (object) {

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 21242d4439860c2065e438b49f5317ccc9116b23..5ea4a086f175a3ef5f6ed2c8ec559051f37bf30e 100644 (file)
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -531,7 +531,7 @@ PHP_FUNCTION(filter_has_var)
        zval        *array_ptr = NULL;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "lS", &arg, &var) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        array_ptr = php_filter_get_storage(arg);

diff --git a/ext/hash/hash.c b/ext/hash/hash.c
index 6b869affdea7f5349c1e84da81ff25fb452313ac..94d673ada2380b0e2e75d0fc3c816f77f68086ab 100644 (file)
--- a/ext/hash/hash.c
+++ b/ext/hash/hash.c
@@ -353,7 +353,7 @@ PHP_FUNCTION(hash_init)
        php_hashcontext_object *hash;
 
        if (zend_parse_parameters(argc, "S|lS", &algo, &options, &key) == FAILURE) {
-               RETURN_NULL();
+               return;
        }
 
        ops = php_hash_fetch_ops(ZSTR_VAL(algo), ZSTR_LEN(algo));

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index f39687dbfacafde6f9b637bf22c7ae3336163d6c..920ae744b645eae88af61246ee1efca602faee35 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -2119,7 +2119,7 @@ PHP_FUNCTION(imap_savebody)
        zend_long msgno, flags = 0;
 
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "rzl|Sl", &stream, &out, &msgno, &section, &flags)) {
-               RETURN_FALSE;
+               return;
        }
 
        if ((imap_ptr = (pils *)zend_fetch_resource(Z_RES_P(stream), "imap", le_imap)) == NULL) {
@@ -4420,7 +4420,7 @@ PHP_FUNCTION(imap_timeout)
        int timeout_type;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|l", &ttype, &timeout) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        if (timeout == -1) {

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 815aecb5e130e8fa90f0149d83cd9a48980a5e6b..6be5dc4fb04fd82f67aebfb8b2ed14f744d088e5 100644 (file)
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -3420,7 +3420,7 @@ PHP_FUNCTION(ldap_parse_exop)
        int rc, myargcount = ZEND_NUM_ARGS();
 
        if (zend_parse_parameters(myargcount, "rr|zz", &link, &result, &retdata, &retoid) != SUCCESS) {
-               WRONG_PARAM_COUNT;
+               return;
        }
 
        if ((ld = (ldap_linkdata *)zend_fetch_resource(Z_RES_P(link), "ldap link", le_link)) == NULL) {
@@ -4316,7 +4316,7 @@ PHP_FUNCTION(ldap_exop_whoami)
        int rc;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &link) == FAILURE) {
-               WRONG_PARAM_COUNT;
+               return;
        }
 
        if ((ld = (ldap_linkdata *)zend_fetch_resource(Z_RES_P(link), "ldap link", le_link)) == NULL) {
@@ -4354,7 +4354,7 @@ PHP_FUNCTION(ldap_exop_refresh)
        int rc;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsz", &link, &ldn.bv_val, &ldn.bv_len, &ttl) != SUCCESS) {
-               WRONG_PARAM_COUNT;
+               return;
        }
 
        if ((ld = (ldap_linkdata *)zend_fetch_resource(Z_RES_P(link), "ldap link", le_link)) == NULL) {

diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
index 9faec5038642c335dab4144f4ddc4684e9e79fcd..3ee2936d14b35012cd5e159218ff2ea415b3ae85 100644 (file)
--- a/ext/opcache/zend_accelerator_module.c
+++ b/ext/opcache/zend_accelerator_module.c
@@ -717,7 +717,7 @@ static ZEND_FUNCTION(opcache_get_configuration)
        zval directives, version, blacklist;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        if (!validate_api_restriction()) {
@@ -809,7 +809,7 @@ static ZEND_FUNCTION(opcache_get_configuration)
 static ZEND_FUNCTION(opcache_reset)
 {
        if (zend_parse_parameters_none() == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        if (!validate_api_restriction()) {

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 4aadd68dfa5f58a7be20f1ca1b82f29744cb3071..a00920df6d77d19f4ea8cc51258823753c6f964c 100644 (file)
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -4908,7 +4908,7 @@ PHP_FUNCTION(openssl_pkey_derive)
        zend_string *result;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz|l", &peer_pub_key, &priv_key, &key_len) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
        if (key_len < 0) {
                php_error_docref(NULL, E_WARNING, "keylen < 0, assuming NULL");

diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index 254c025ef891afcb5c7535fface092ac88a922a7..465392f439c0a8534e51bf3efbdf5a92cdde1f52 100644 (file)
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -1279,7 +1279,7 @@ PHP_FUNCTION(pcntl_setpriority)
        zend_long pri;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|ll", &pri, &pid, &who) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        if (setpriority(who, pid, pri)) {

diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index b3d4f243637f5e185edca95f6e1843aa6d324675..e5a740d9d7704d63b97251975acaade2ba13a356 100644 (file)
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -1051,12 +1051,12 @@ static PHP_METHOD(PDO, query)
        /* Return a meaningful error when no parameters were passed */
        if (!ZEND_NUM_ARGS()) {
                zend_parse_parameters(0, "z|z", NULL, NULL);
-               RETURN_FALSE;
+               return;
        }
 
        if (FAILURE == zend_parse_parameters(1, "s", &statement,
                        &statement_len)) {
-               RETURN_FALSE;
+               return;
        }
 
        PDO_DBH_CLEAR_ERR();

diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 771c7a4ddef73d63797cf22b5536192f044af202..30fb12338c8fd570d1968e4183ba9a818e6af6ed 100644 (file)
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -1578,7 +1578,7 @@ static PHP_METHOD(PDOStatement, bindValue)
                        "lz|l", &param.paramno, &parameter, &param_type)) {
                if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "Sz|l", &param.name,
                                &parameter, &param_type)) {
-                       RETURN_FALSE;
+                       return;
                }
        }
 

diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c
index 68d8ee30f012712ad0a428b2ab01944598384a36..d22c99d39941778ac25daa980f0cab50fe1e0cba 100644 (file)
--- a/ext/pdo_pgsql/pgsql_driver.c
+++ b/ext/pdo_pgsql/pgsql_driver.c
@@ -956,7 +956,7 @@ static PHP_METHOD(PDO, pgsqlLOBOpen)
 
        if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s|s",
                                &oidstr, &oidstrlen, &modestr, &modestrlen)) {
-               RETURN_FALSE;
+               return;
        }
 
        oid = (Oid)strtoul(oidstr, &end_ptr, 10);
@@ -1003,7 +1003,7 @@ static PHP_METHOD(PDO, pgsqlLOBUnlink)
 
        if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s",
                                &oidstr, &oidlen)) {
-               RETURN_FALSE;
+               return;
        }
 
        oid = (Oid)strtoul(oidstr, &end_ptr, 10);
@@ -1039,7 +1039,7 @@ static PHP_METHOD(PDO, pgsqlGetNotify)
 
        if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "|ll",
                                &result_type, &ms_timeout)) {
-               RETURN_FALSE;
+               return;
        }
 
        dbh = Z_PDO_DBH_P(ZEND_THIS);

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index cb963362e24560510a00a3011278de09ed822481..e4d66c9791ac367adf7876c041feb0447bfe4d81 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -2944,7 +2944,7 @@ PHP_FUNCTION(pg_fetch_all_columns)
        size_t num_fields;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l", &result, &colno) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        if ((pg_result = (pgsql_result_handle *)zend_fetch_resource(Z_RES_P(result), "PostgreSQL result", le_result)) == NULL) {

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index aaa27bf001558134d5712a03cd0ab7e8b985ecb7..0b7d822e72ad35454f0ee19940cd2adb4f171f51 100644 (file)
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -1316,7 +1316,7 @@ PHP_METHOD(Phar, unlinkArchive)
        phar_archive_data *phar;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "p", &fname, &fname_len) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        if (!fname_len) {
@@ -1736,7 +1736,7 @@ PHP_METHOD(Phar, buildFromDirectory)
        }
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|s", &dir, &dir_len, &regex, &regex_len) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        if (ZEND_SIZE_T_UINT_OVFL(dir_len)) {
@@ -1872,7 +1872,7 @@ PHP_METHOD(Phar, buildFromIterator)
        }
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|s", &obj, zend_ce_traversable, &base, &base_len) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        if (ZEND_SIZE_T_UINT_OVFL(base_len)) {
@@ -1921,7 +1921,7 @@ PHP_METHOD(Phar, count)
        PHAR_ARCHIVE_OBJECT();
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &mode) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        RETURN_LONG(zend_hash_num_elements(&phar_obj->archive->manifest));
@@ -1938,7 +1938,7 @@ PHP_METHOD(Phar, isFileFormat)
        PHAR_ARCHIVE_OBJECT();
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &type) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        switch (type) {
@@ -2641,7 +2641,7 @@ PHP_METHOD(Phar, delete)
        }
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "p", &fname, &fname_len) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        if (phar_obj->archive->is_persistent && FAILURE == phar_copy_on_write(&(phar_obj->archive))) {
@@ -2985,7 +2985,7 @@ PHP_METHOD(Phar, setDefaultStub)
        }
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s!s", &index, &index_len, &webindex, &webindex_len) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        if (ZEND_NUM_ARGS() > 0 && (phar_obj->archive->is_tar || phar_obj->archive->is_zip)) {

diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 7a1ea53954fe9d6d9476944a9680e347e146efff..4445bd6f02926af950d71a7f3f79c98dfb8bf99c 100644 (file)
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -160,7 +160,7 @@ PHP_FUNCTION(readline)
        char *result;
 
        if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "|s!", &prompt, &prompt_len)) {
-               RETURN_FALSE;
+               return;
        }
 
        result = readline(prompt);
@@ -522,7 +522,7 @@ PHP_FUNCTION(readline_completion_function)
        zval *arg;
 
        if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "z", &arg)) {
-               RETURN_FALSE;
+               return;
        }
 
        if (!zend_is_callable(arg, 0, NULL)) {

diff --git a/ext/session/session.c b/ext/session/session.c
index a7b478f978555d850303b407d7a6da9b1b4e6e6d..ecef41e290f8d19b4b8d8d34dafe41bb1666555e 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1952,7 +1952,7 @@ static PHP_FUNCTION(session_set_save_handler)
                zend_bool register_shutdown = 1;
 
                if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|b", &obj, php_session_iface_entry, &register_shutdown) == FAILURE) {
-                       RETURN_FALSE;
+                       return;
                }
 
                /* For compatibility reason, implemented interface is not checked */
@@ -2452,7 +2452,7 @@ static PHP_FUNCTION(session_start)
        zend_long read_and_close = 0;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "|a", &options) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        if (PS(session_status) == php_session_active) {

diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 575c213181b519a91a61adf7c3161b5901c5335b..e1b87502d6d8ac61223523d32dbc6810ef57119e 100644 (file)
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -2368,7 +2368,7 @@ PHP_FUNCTION(socket_addrinfo_lookup)
        memset(&hints, 0, sizeof(hints));
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|sa", &hostname, &service, &service_len, &zhints) == FAILURE) {
-               RETURN_NULL();
+               return;
        }
 
        if (zhints) {

diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index f3bf3969ee05e6a810e49f35c07a97e43755d9ae..341029a543c089d8c9f58db45e290640a3da4058 100644 (file)
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
@@ -88,7 +88,7 @@ PHP_FUNCTION(class_parents)
        zend_bool autoload = 1;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|b", &obj, &autoload) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        if (Z_TYPE_P(obj) != IS_OBJECT && Z_TYPE_P(obj) != IS_STRING) {
@@ -122,7 +122,7 @@ PHP_FUNCTION(class_implements)
        zend_class_entry *ce;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|b", &obj, &autoload) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
        if (Z_TYPE_P(obj) != IS_OBJECT && Z_TYPE_P(obj) != IS_STRING) {
                php_error_docref(NULL, E_WARNING, "object or string expected");
@@ -151,7 +151,7 @@ PHP_FUNCTION(class_uses)
        zend_class_entry *ce;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|b", &obj, &autoload) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
        if (Z_TYPE_P(obj) != IS_OBJECT && Z_TYPE_P(obj) != IS_STRING) {
                php_error_docref(NULL, E_WARNING, "object or string expected");
@@ -312,7 +312,7 @@ PHP_FUNCTION(spl_autoload)
        zend_string *class_name, *lc_name, *file_exts = SPL_G(autoload_extensions);
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|S", &class_name, &file_exts) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        if (file_exts == NULL) { /* autoload_extensions is not initialized, set to defaults */

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index a6ca5066d30e5da9a30d5deb4310601f058579be..f0fd35822941ef58956934eb90f42a43cec2ee1d 100644 (file)
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -3526,7 +3526,7 @@ PHP_FUNCTION(iterator_to_array)
        zend_bool use_keys = 1;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|b", &obj, zend_ce_traversable, &use_keys) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        array_init(return_value);
@@ -3548,7 +3548,7 @@ PHP_FUNCTION(iterator_count)
        zend_long  count = 0;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &obj, zend_ce_traversable) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        if (spl_iterator_apply(obj, spl_iterator_count_apply, (void*)&count) == FAILURE) {

diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c
index ef710eb6be2c9e4ded5837f6ac6bb90f74ad7bf7..c817098b9c38348f5886565dfc807de30e890f77 100644 (file)
--- a/ext/sysvsem/sysvsem.c
+++ b/ext/sysvsem/sysvsem.c
@@ -181,7 +181,7 @@ PHP_FUNCTION(sem_get)
        sysvsem_sem *sem_ptr;
 
        if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "l|lll", &key, &max_acquire, &perm, &auto_release)) {
-               RETURN_FALSE;
+               return;
        }
 
        /* Get/create the semaphore.  Note that we rely on the semaphores

diff --git a/ext/xsl/xsltprocessor.c b/ext/xsl/xsltprocessor.c
index cb15486518e83c1338ec106ff657d3cab80f2c57..7c023f0fc76b377aec397487f9658d4ae18d0945 100644 (file)
--- a/ext/xsl/xsltprocessor.c
+++ b/ext/xsl/xsltprocessor.c
@@ -403,7 +403,7 @@ PHP_FUNCTION(xsl_xsltprocessor_import_stylesheet)
 
        id = ZEND_THIS;
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &docp) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        nodep = php_libxml_import_node(docp);
@@ -630,7 +630,7 @@ PHP_FUNCTION(xsl_xsltprocessor_transform_to_doc)
        sheetp = (xsltStylesheetPtr) intern->ptr;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "o|S!", &docp, &ret_class) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        newdocp = php_xsl_apply_stylesheet(id, intern, sheetp, docp);
@@ -687,7 +687,7 @@ PHP_FUNCTION(xsl_xsltprocessor_transform_to_uri)
        sheetp = (xsltStylesheetPtr) intern->ptr;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "op", &docp, &uri, &uri_len) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        newdocp = php_xsl_apply_stylesheet(id, intern, sheetp, docp);
@@ -719,7 +719,7 @@ PHP_FUNCTION(xsl_xsltprocessor_transform_to_xml)
        sheetp = (xsltStylesheetPtr) intern->ptr;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &docp) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
 
        newdocp = php_xsl_apply_stylesheet(id, intern, sheetp, docp);
@@ -800,7 +800,7 @@ PHP_FUNCTION(xsl_xsltprocessor_get_parameter)
        DOM_GET_THIS(id);
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "sS", &namespace, &namespace_len, &name) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
        intern = Z_XSL_P(id);
        if ((value = zend_hash_find(intern->parameter, name)) != NULL) {
@@ -824,7 +824,7 @@ PHP_FUNCTION(xsl_xsltprocessor_remove_parameter)
        DOM_GET_THIS(id);
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "sS", &namespace, &namespace_len, &name) == FAILURE) {
-               RETURN_FALSE;
+               return;
        }
        intern = Z_XSL_P(id);
        if (zend_hash_del(intern->parameter, name) == SUCCESS) {

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index e9fe6b0a8a33383d662c40a77651292fe5ec1b19..0db20c9010927d59642395a1abc6a656c4497c9e 100644 (file)
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -489,7 +489,7 @@ static PHP_FUNCTION(ob_gzhandler)
         * - we have to mess around with php_output_context */
 
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "sl", &in_str, &in_len, &flags)) {
-               RETURN_FALSE;
+               return;
        }
 
        if (!(encoding = php_zlib_output_encoding())) {
@@ -1028,7 +1028,7 @@ PHP_FUNCTION(inflate_get_status)
 
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "r", &res))
        {
-               RETURN_NULL();
+               return;
        }
 
        if (!(ctx = zend_fetch_resource_ex(res, NULL, le_inflate))) {
@@ -1049,7 +1049,7 @@ PHP_FUNCTION(inflate_get_read_len)
 
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "r", &res))
        {
-               RETURN_NULL();
+               return;
        }
 
        if (!(ctx = zend_fetch_resource_ex(res, NULL, le_inflate))) {