summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2001-08-14 05:44:33 +0000
committerfoobar <sniper@php.net>2001-08-14 05:44:33 +0000
commit442669055bd6d37c6fbb400de4eebad21fa5595f (patch)
tree5e4da7f61ef8e69303bfa078223b607a65bb7f0b
parent292d27bf6a5667fc741afcb8938dc0cee00688a8 (diff)
downloadphp-git-442669055bd6d37c6fbb400de4eebad21fa5595f.tar.gz
Another TSRMLS_FETCH() nuke.
-rw-r--r--ext/dba/dba.c4
-rw-r--r--ext/dba/dba_db2.c1
-rw-r--r--ext/dba/php_dba.h2
3 files changed, 3 insertions, 4 deletions
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 08e533142c..20ca60863b 100644
--- 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 9de4e54949..278ebdf223 100644
--- 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 01ac87d7ee..80b4ff009c 100644
--- 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) \