Skip to content

Commit e89048a

Browse files
kaja47kaja47
authored
Use FastZPP for SQLite3Stmt/SQLite3Result (#7392)
1 parent d379044 commit e89048a

File tree

1 file changed

+23
-39
lines changed

1 file changed

+23
-39
lines changed

‎ext/sqlite3/sqlite3.c

Lines changed: 23 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1390,9 +1390,7 @@ PHP_METHOD(SQLite3Stmt, paramCount)
13901390
zval *object = ZEND_THIS;
13911391
stmt_obj = Z_SQLITE3_STMT_P(object);
13921392

1393-
if (zend_parse_parameters_none() == FAILURE) {
1394-
RETURN_THROWS();
1395-
}
1393+
ZEND_PARSE_PARAMETERS_NONE();
13961394

13971395
SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3);
13981396
SQLITE3_CHECK_INITIALIZED_STMT(stmt_obj->stmt, SQLite3Stmt);
@@ -1408,9 +1406,7 @@ PHP_METHOD(SQLite3Stmt, close)
14081406
zval *object = ZEND_THIS;
14091407
stmt_obj = Z_SQLITE3_STMT_P(object);
14101408

1411-
if (zend_parse_parameters_none() == FAILURE) {
1412-
RETURN_THROWS();
1413-
}
1409+
ZEND_PARSE_PARAMETERS_NONE();
14141410

14151411
SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3);
14161412

@@ -1429,9 +1425,7 @@ PHP_METHOD(SQLite3Stmt, reset)
14291425
zval *object = ZEND_THIS;
14301426
stmt_obj = Z_SQLITE3_STMT_P(object);
14311427

1432-
if (zend_parse_parameters_none() == FAILURE) {
1433-
RETURN_THROWS();
1434-
}
1428+
ZEND_PARSE_PARAMETERS_NONE();
14351429

14361430
SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3);
14371431
SQLITE3_CHECK_INITIALIZED_STMT(stmt_obj->stmt, SQLite3Stmt);
@@ -1451,9 +1445,7 @@ PHP_METHOD(SQLite3Stmt, clear)
14511445
zval *object = ZEND_THIS;
14521446
stmt_obj = Z_SQLITE3_STMT_P(object);
14531447

1454-
if (zend_parse_parameters_none() == FAILURE) {
1455-
RETURN_THROWS();
1456-
}
1448+
ZEND_PARSE_PARAMETERS_NONE();
14571449

14581450
SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3);
14591451
SQLITE3_CHECK_INITIALIZED_STMT(stmt_obj->stmt, SQLite3Stmt);
@@ -1480,9 +1472,7 @@ PHP_METHOD(SQLite3Stmt, readOnly)
14801472
zval *object = ZEND_THIS;
14811473
stmt_obj = Z_SQLITE3_STMT_P(object);
14821474

1483-
if (zend_parse_parameters_none() == FAILURE) {
1484-
RETURN_THROWS();
1485-
}
1475+
ZEND_PARSE_PARAMETERS_NONE();
14861476

14871477
SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3);
14881478
SQLITE3_CHECK_INITIALIZED_STMT(stmt_obj->stmt, SQLite3Stmt);
@@ -1611,9 +1601,10 @@ PHP_METHOD(SQLite3Stmt, getSQL)
16111601
stmt_obj = Z_SQLITE3_STMT_P(object);
16121602
int bind_rc;
16131603

1614-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|b", &expanded) == FAILURE) {
1615-
RETURN_THROWS();
1616-
}
1604+
ZEND_PARSE_PARAMETERS_START(0, 1)
1605+
Z_PARAM_OPTIONAL
1606+
Z_PARAM_BOOL(expanded)
1607+
ZEND_PARSE_PARAMETERS_END();
16171608

16181609
SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3);
16191610
SQLITE3_CHECK_INITIALIZED_STMT(stmt_obj->stmt, SQLite3Stmt);
@@ -1774,9 +1765,7 @@ PHP_METHOD(SQLite3Stmt, execute)
17741765

17751766
stmt_obj = Z_SQLITE3_STMT_P(object);
17761767

1777-
if (zend_parse_parameters_none() == FAILURE) {
1778-
RETURN_THROWS();
1779-
}
1768+
ZEND_PARSE_PARAMETERS_NONE();
17801769

17811770
SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3);
17821771

@@ -1877,9 +1866,7 @@ PHP_METHOD(SQLite3Result, numColumns)
18771866
zval *object = ZEND_THIS;
18781867
result_obj = Z_SQLITE3_RESULT_P(object);
18791868

1880-
if (zend_parse_parameters_none() == FAILURE) {
1881-
RETURN_THROWS();
1882-
}
1869+
ZEND_PARSE_PARAMETERS_NONE();
18831870

18841871
SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result)
18851872

@@ -1896,9 +1883,9 @@ PHP_METHOD(SQLite3Result, columnName)
18961883
char *column_name;
18971884
result_obj = Z_SQLITE3_RESULT_P(object);
18981885

1899-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &column) == FAILURE) {
1900-
RETURN_THROWS();
1901-
}
1886+
ZEND_PARSE_PARAMETERS_START(1, 1)
1887+
Z_PARAM_LONG(column)
1888+
ZEND_PARSE_PARAMETERS_END();
19021889

19031890
SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result)
19041891

@@ -1920,9 +1907,9 @@ PHP_METHOD(SQLite3Result, columnType)
19201907
zend_long column = 0;
19211908
result_obj = Z_SQLITE3_RESULT_P(object);
19221909

1923-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &column) == FAILURE) {
1924-
RETURN_THROWS();
1925-
}
1910+
ZEND_PARSE_PARAMETERS_START(1, 1)
1911+
Z_PARAM_LONG(column)
1912+
ZEND_PARSE_PARAMETERS_END();
19261913

19271914
SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result)
19281915

@@ -1943,9 +1930,10 @@ PHP_METHOD(SQLite3Result, fetchArray)
19431930
zend_long mode = PHP_SQLITE3_BOTH;
19441931
result_obj = Z_SQLITE3_RESULT_P(object);
19451932

1946-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &mode) == FAILURE) {
1947-
RETURN_THROWS();
1948-
}
1933+
ZEND_PARSE_PARAMETERS_START(0, 1)
1934+
Z_PARAM_OPTIONAL
1935+
Z_PARAM_LONG(mode)
1936+
ZEND_PARSE_PARAMETERS_END();
19491937

19501938
SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result)
19511939

@@ -1996,9 +1984,7 @@ PHP_METHOD(SQLite3Result, reset)
19961984
zval *object = ZEND_THIS;
19971985
result_obj = Z_SQLITE3_RESULT_P(object);
19981986

1999-
if (zend_parse_parameters_none() == FAILURE) {
2000-
RETURN_THROWS();
2001-
}
1987+
ZEND_PARSE_PARAMETERS_NONE();
20021988

20031989
SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result)
20041990

@@ -2017,9 +2003,7 @@ PHP_METHOD(SQLite3Result, finalize)
20172003
zval *object = ZEND_THIS;
20182004
result_obj = Z_SQLITE3_RESULT_P(object);
20192005

2020-
if (zend_parse_parameters_none() == FAILURE) {
2021-
RETURN_THROWS();
2022-
}
2006+
ZEND_PARSE_PARAMETERS_NONE();
20232007

20242008
SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result)
20252009

0 commit comments

Comments
 (0)