com php-src: Merge branch 'PHP-7.1': ext/pdo_sqlite/sqlite_ driver.c ext/sqlite3/sqlite3.c
| From: | Nikita Popov | Date: | Sun, 12 Mar 2017 16:04:02 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.1': ext/pdo_sqlite/sqlite_ driver.c ext/sqlite3/sqlite3.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-97285@lists.php.net to get a copy of this message | ||
Commit: e31342ef843f98523722b2d37ea23190bf2781af
Author: Nikita Popov <nikita.ppv@gmail.com> Sun, 12 Mar 2017 17:04:02 +0100
Parents: 22e6b5ef220345bb187c93a293ee436a80f897d1 fbf0e0587f8455525466e6d4ab2c1f0fc24bfe26
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e31342ef843f98523722b2d37ea23190bf2781af
Log:
Merge branch 'PHP-7.1'
Changed paths:
MM ext/pdo_sqlite/sqlite_driver.c
MM ext/sqlite3/sqlite3.c
Diff:
diff --cc ext/pdo_sqlite/sqlite_driver.c
index c5fd54c,71bac85..1e3e071f
--- a/ext/pdo_sqlite/sqlite_driver.c
+++ b/ext/pdo_sqlite/sqlite_driver.c
@@@ -519,12 -520,10 +520,13 @@@ static PHP_METHOD(SQLite, sqliteCreateF
pdo_sqlite_db_handle *H;
int ret;
- ZEND_PARSE_PARAMETERS_START(2, 3)
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "sz|ll",
- &func_name, &func_name_len, &callback, &argc, &flags)) {
- RETURN_FALSE;
- }
++ ZEND_PARSE_PARAMETERS_START(2, 4)
+ Z_PARAM_STRING(func_name, func_name_len)
+ Z_PARAM_ZVAL_DEREF(callback)
+ Z_PARAM_OPTIONAL
+ Z_PARAM_LONG(argc)
++ Z_PARAM_LONG(flags)
+ ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
dbh = Z_PDO_DBH_P(getThis());
PDO_CONSTRUCT_CHECK;