cvs: php4 /ext/dba dba.c dba_db2.c php_dba.h

sniper Tue Aug 14 01:44:34 2001 EDT Modified files: /php4/ext/dba dba.c dba_db2.c php_dba.h Log: Another TSRMLS_FETCH() nuke. Index: php4/ext/dba/dba.c diff -u php4/ext/dba/dba.c:1.36 php4/ext/dba/dba.c:1.37 --- php4/ext/dba/dba.c:1.36 Sat Aug 11 12:38:23 2001 +++ php4/ext/dba/dba.c Tue Aug 14 01:44:33 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.36 2001/08/11 16:38:23 zeev Exp $ */ +/* $Id: dba.c,v 1.37 2001/08/14 05:44:33 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -74,7 +74,7 @@ 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 @@ 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; Index: php4/ext/dba/dba_db2.c diff -u php4/ext/dba/dba_db2.c:1.13 php4/ext/dba/dba_db2.c:1.14 --- php4/ext/dba/dba_db2.c:1.13 Mon Aug 6 08:15:05 2001 +++ php4/ext/dba/dba_db2.c Tue Aug 14 01:44:33 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_db2.c,v 1.13 2001/08/06 12:15:05 sniper Exp $ */ +/* $Id: dba_db2.c,v 1.14 2001/08/14 05:44:33 sniper Exp $ */ #include "php.h" @@ -47,7 +47,6 @@ 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 : Index: php4/ext/dba/php_dba.h diff -u php4/ext/dba/php_dba.h:1.8 php4/ext/dba/php_dba.h:1.9 --- php4/ext/dba/php_dba.h:1.8 Tue Jun 19 17:25:53 2001 +++ php4/ext/dba/php_dba.h Tue Aug 14 01:44:33 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dba.h,v 1.8 2001/06/19 21:25:53 sbergmann Exp $ */ +/* $Id: php_dba.h,v 1.9 2001/08/14 05:44:33 sniper Exp $ */ #ifndef PHP_DBA_H #define PHP_DBA_H @@ -48,7 +48,7 @@ /* 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) \