]> granicus.if.org Git - php/commitdiff
Use new param API in pdo_sqlite
authorSara Golemon <pollita@php.net>
Sat, 31 Dec 2016 16:59:49 +0000 (08:59 -0800)
committerSara Golemon <pollita@php.net>
Sat, 31 Dec 2016 17:01:20 +0000 (09:01 -0800)
ext/pdo_sqlite/sqlite_driver.c

index 22fb8a46b956ab8b618d6a69e6158e0e3c1b1524..3d76f088d8c03c25ccf69b5f15dae12613937626 100644 (file)
@@ -519,10 +519,12 @@ static PHP_METHOD(SQLite, sqliteCreateFunction)
        pdo_sqlite_db_handle *H;
        int ret;
 
-       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "sz|l",
-                       &func_name, &func_name_len, &callback, &argc)) {
-               RETURN_FALSE;
-       }
+       ZEND_PARSE_PARAMETERS_START(2, 3)
+               Z_PARAM_STRING(func_name, func_name_len)
+               Z_PARAM_ZVAL_DEREF(callback)
+               Z_PARAM_OPTIONAL
+               Z_PARAM_LONG(argc)
+       ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
 
        dbh = Z_PDO_DBH_P(getThis());
        PDO_CONSTRUCT_CHECK;
@@ -589,10 +591,13 @@ static PHP_METHOD(SQLite, sqliteCreateAggregate)
        pdo_sqlite_db_handle *H;
        int ret;
 
-       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "szz|l",
-                       &func_name, &func_name_len, &step_callback, &fini_callback, &argc)) {
-               RETURN_FALSE;
-       }
+       ZEND_PARSE_PARAMETERS_START(3, 4)
+               Z_PARAM_STRING(func_name, func_name_len)
+               Z_PARAM_ZVAL_DEREF(step_callback)
+               Z_PARAM_ZVAL_DEREF(fini_callback)
+               Z_PARAM_OPTIONAL
+               Z_PARAM_LONG(argc)
+       ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
 
        dbh = Z_PDO_DBH_P(getThis());
        PDO_CONSTRUCT_CHECK;
@@ -649,10 +654,10 @@ static PHP_METHOD(SQLite, sqliteCreateCollation)
        pdo_sqlite_db_handle *H;
        int ret;
 
-       if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "sz",
-               &collation_name, &collation_name_len, &callback)) {
-               RETURN_FALSE;
-       }
+       ZEND_PARSE_PARAMETERS_START(2, 2)
+               Z_PARAM_STRING(collation_name, collation_name_len)
+               Z_PARAM_ZVAL_DEREF(callback)
+       ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
 
        dbh = Z_PDO_DBH_P(getThis());
        PDO_CONSTRUCT_CHECK;