Another TSRMLS_FETCH() nuke.

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 08e533142c511eba932f1ab56b4e30ef79de9fc7..20ca60863bda129ac2d83652afa7059eb1b9eddb 100644 (file)
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -74,7 +74,7 @@ ZEND_GET_MODULE(dba)
 
 typedef struct dba_handler {
        char *name;
-       int (*open)(dba_info *);
+       int (*open)(dba_info * TSRMLS_DC);
        void (*close)(dba_info *);
        char* (*fetch)(dba_info *, char *, int, int *);
        int (*update)(dba_info *, char *, int, char *, int, int);
@@ -345,7 +345,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
        info->argv = args + 3;
        info->hnd = NULL;
 
-       if(hptr->open(info) != SUCCESS) {
+       if(hptr->open(info TSRMLS_CC) != SUCCESS) {
                dba_close(info);
                php_error(E_WARNING, "driver initialization failed");
                FREENOW;

diff --git a/ext/dba/dba_db2.c b/ext/dba/dba_db2.c
index 9de4e54949c0d8268c44e95b9528ff014f386c79..278ebdf2233b9b3b0e51765e5ca6b98e29c3c32c 100644 (file)
--- a/ext/dba/dba_db2.c
+++ b/ext/dba/dba_db2.c
@@ -47,7 +47,6 @@ DBA_OPEN_FUNC(db2)
        int gmode = 0;
        int filemode = 0644;
        struct stat check_stat;
-       TSRMLS_FETCH();
        
        type =  info->mode == DBA_READER ? DB_UNKNOWN :
                info->mode == DBA_TRUNC ? DB_BTREE :

diff --git a/ext/dba/php_dba.h b/ext/dba/php_dba.h
index 01ac87d7ee8632563db3e79e2fb27965614af8a1..80b4ff009cd7c4d847db8217c863655a609643d4 100644 (file)
--- a/ext/dba/php_dba.h
+++ b/ext/dba/php_dba.h
@@ -48,7 +48,7 @@ extern zend_module_entry dba_module_entry;
 /* common prototypes which must be supplied by modules */
 
 #define DBA_OPEN_FUNC(x) \
-       int dba_open_##x(dba_info *info)
+       int dba_open_##x(dba_info *info TSRMLS_DC)
 #define DBA_CLOSE_FUNC(x) \
        void dba_close_##x(dba_info *info)
 #define DBA_FETCH_FUNC(x) \