diff options
Diffstat (limited to 'ext/pdo_sqlite')
| -rw-r--r-- | ext/pdo_sqlite/pdo_sqlite.c | 2 | ||||
| -rw-r--r-- | ext/pdo_sqlite/php_pdo_sqlite.h | 10 | ||||
| -rw-r--r-- | ext/pdo_sqlite/sqlite_driver.c | 7 |
3 files changed, 2 insertions, 17 deletions
diff --git a/ext/pdo_sqlite/pdo_sqlite.c b/ext/pdo_sqlite/pdo_sqlite.c index a26d55494b..ca077092a3 100644 --- a/ext/pdo_sqlite/pdo_sqlite.c +++ b/ext/pdo_sqlite/pdo_sqlite.c @@ -39,12 +39,10 @@ const zend_function_entry pdo_sqlite_functions[] = { /* {{{ pdo_sqlite_deps */ -#if ZEND_MODULE_API_NO >= 20050922 static const zend_module_dep pdo_sqlite_deps[] = { ZEND_MOD_REQUIRED("pdo") ZEND_MOD_END }; -#endif /* }}} */ /* {{{ pdo_sqlite_module_entry diff --git a/ext/pdo_sqlite/php_pdo_sqlite.h b/ext/pdo_sqlite/php_pdo_sqlite.h index f5e4457971..5d924f800b 100644 --- a/ext/pdo_sqlite/php_pdo_sqlite.h +++ b/ext/pdo_sqlite/php_pdo_sqlite.h @@ -48,16 +48,6 @@ ZEND_BEGIN_MODULE_GLOBALS(pdo_sqlite) ZEND_END_MODULE_GLOBALS(pdo_sqlite) */ -/* In every utility function you add that needs to use variables - in php_pdo_sqlite_globals, call TSRMLS_FETCH(); after declaring other - variables used by that function, or better yet, pass in - after the last function argument and declare your utility function - with after the last declared argument. Always refer to - the globals in your function as PDO_SQLITE_G(variable). You are - encouraged to rename these macros something shorter, see - examples in any other php module directory. -*/ - #ifdef ZTS #define PDO_SQLITE_G(v) TSRMG(pdo_sqlite_globals_id, zend_pdo_sqlite_globals *, v) #else diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c index 346cdf2f27..22fb8a46b9 100644 --- a/ext/pdo_sqlite/sqlite_driver.c +++ b/ext/pdo_sqlite/sqlite_driver.c @@ -325,9 +325,7 @@ static int do_callback(struct pdo_sqlite_fci *fc, zval *cb, fake_argc = argc + is_agg; fc->fci.size = sizeof(fc->fci); - fc->fci.function_table = EG(function_table); ZVAL_COPY_VALUE(&fc->fci.function_name, cb); - fc->fci.symbol_table = NULL; fc->fci.object = NULL; fc->fci.retval = &retval; fc->fci.param_count = fake_argc; @@ -476,9 +474,7 @@ static int php_sqlite3_collation_callback(void *context, struct pdo_sqlite_collation *collation = (struct pdo_sqlite_collation*) context; collation->fc.fci.size = sizeof(collation->fc.fci); - collation->fc.fci.function_table = EG(function_table); ZVAL_COPY_VALUE(&collation->fc.fci.function_name, &collation->callback); - collation->fc.fci.symbol_table = NULL; collation->fc.fci.object = NULL; collation->fc.fci.retval = &retval; @@ -731,7 +727,8 @@ static struct pdo_dbh_methods sqlite_methods = { pdo_sqlite_get_attribute, NULL, /* check_liveness: not needed */ get_driver_methods, - pdo_sqlite_request_shutdown + pdo_sqlite_request_shutdown, + NULL }; static char *make_filename_safe(const char *filename) |