Skip to content

Commit 61a4319

Browse files
committed
Use new param API in pdo_sqlite
1 parent 8bbfe17 commit 61a4319

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

ext/pdo_sqlite/sqlite_driver.c

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -519,10 +519,12 @@ static PHP_METHOD(SQLite, sqliteCreateFunction)
519519
pdo_sqlite_db_handle *H;
520520
int ret;
521521

522-
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "sz|l",
523-
&func_name, &func_name_len, &callback, &argc)) {
524-
RETURN_FALSE;
525-
}
522+
ZEND_PARSE_PARAMETERS_START(2, 3)
523+
Z_PARAM_STRING(func_name, func_name_len)
524+
Z_PARAM_ZVAL_DEREF(callback)
525+
Z_PARAM_OPTIONAL
526+
Z_PARAM_LONG(argc)
527+
ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
526528

527529
dbh = Z_PDO_DBH_P(getThis());
528530
PDO_CONSTRUCT_CHECK;
@@ -589,10 +591,13 @@ static PHP_METHOD(SQLite, sqliteCreateAggregate)
589591
pdo_sqlite_db_handle *H;
590592
int ret;
591593

592-
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "szz|l",
593-
&func_name, &func_name_len, &step_callback, &fini_callback, &argc)) {
594-
RETURN_FALSE;
595-
}
594+
ZEND_PARSE_PARAMETERS_START(3, 4)
595+
Z_PARAM_STRING(func_name, func_name_len)
596+
Z_PARAM_ZVAL_DEREF(step_callback)
597+
Z_PARAM_ZVAL_DEREF(fini_callback)
598+
Z_PARAM_OPTIONAL
599+
Z_PARAM_LONG(argc)
600+
ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
596601

597602
dbh = Z_PDO_DBH_P(getThis());
598603
PDO_CONSTRUCT_CHECK;
@@ -649,10 +654,10 @@ static PHP_METHOD(SQLite, sqliteCreateCollation)
649654
pdo_sqlite_db_handle *H;
650655
int ret;
651656

652-
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "sz",
653-
&collation_name, &collation_name_len, &callback)) {
654-
RETURN_FALSE;
655-
}
657+
ZEND_PARSE_PARAMETERS_START(2, 2)
658+
Z_PARAM_STRING(collation_name, collation_name_len)
659+
Z_PARAM_ZVAL_DEREF(callback)
660+
ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
656661

657662
dbh = Z_PDO_DBH_P(getThis());
658663
PDO_CONSTRUCT_CHECK;

0 commit comments

Comments
 (0)