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

helly Mon Nov 4 07:27:13 2002 EDT Modified files: /php4/ext/dba dba.c dba_db2.c dba_db3.c php_dba.h Log: passing around TSRM #going to add CDB_MAKE support Index: php4/ext/dba/dba.c diff -u php4/ext/dba/dba.c:1.48 php4/ext/dba/dba.c:1.49 --- php4/ext/dba/dba.c:1.48 Sun Nov 3 11:43:06 2002 +++ php4/ext/dba/dba.c Mon Nov 4 07:27:12 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.48 2002/11/03 16:43:06 helly Exp $ */ +/* $Id: dba.c,v 1.49 2002/11/04 12:27:12 helly Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -80,15 +80,15 @@ typedef struct dba_handler { char *name; int (*open)(dba_info * TSRMLS_DC); - void (*close)(dba_info *); - char* (*fetch)(dba_info *, char *, int, int, int *); - int (*update)(dba_info *, char *, int, char *, int, int); - int (*exists)(dba_info *, char *, int); - int (*delete)(dba_info *, char *, int); - char* (*firstkey)(dba_info *, int *); - char* (*nextkey)(dba_info *, int *); - int (*optimize)(dba_info *); - int (*sync)(dba_info *); + void (*close)(dba_info * TSRMLS_DC); + char* (*fetch)(dba_info *, char *, int, int, int * TSRMLS_DC); + int (*update)(dba_info *, char *, int, char *, int, int TSRMLS_DC); + int (*exists)(dba_info *, char *, int TSRMLS_DC); + int (*delete)(dba_info *, char *, int TSRMLS_DC); + char* (*firstkey)(dba_info *, int * TSRMLS_DC); + char* (*nextkey)(dba_info *, int * TSRMLS_DC); + int (*optimize)(dba_info * TSRMLS_DC); + int (*sync)(dba_info * TSRMLS_DC); } dba_handler; /* {{{ macromania */ @@ -189,9 +189,9 @@ /* {{{ dba_close */ -static void dba_close(dba_info *info) +static void dba_close(dba_info *info TSRMLS_DC) { - if(info->hnd) info->hnd->close(info); + if(info->hnd) info->hnd->close(info TSRMLS_CC); if(info->path) free(info->path); free(info); } @@ -203,7 +203,7 @@ { dba_info *info = (dba_info *)rsrc->ptr; - dba_close(info); + dba_close(info TSRMLS_CC); } /* }}} */ @@ -268,7 +268,7 @@ DBA_WRITE_CHECK; - if(info->hnd->update(info, VALLEN(key), VALLEN(val), mode) == SUCCESS) + if(info->hnd->update(info, VALLEN(key), VALLEN(val), mode TSRMLS_CC) == SUCCESS) RETURN_TRUE; RETURN_FALSE; } @@ -369,7 +369,7 @@ info->hnd = NULL; if (hptr->open(info TSRMLS_CC) != SUCCESS) { - dba_close(info); + dba_close(info TSRMLS_CC); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Driver initialization failed for handler: %s", Z_STRVAL_PP(args[2])); FREENOW; RETURN_FALSE; @@ -428,7 +428,7 @@ { DBA_ID_GET2; - if(info->hnd->exists(info, VALLEN(key)) == SUCCESS) { + if(info->hnd->exists(info, VALLEN(key) TSRMLS_CC) == SUCCESS) { RETURN_TRUE; } RETURN_FALSE; @@ -446,7 +446,7 @@ if (ac==3 && strcmp(info->hnd->name, "cdb")) { php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Handler %s does not support optional skip parameter", info->hnd->name); } - if((val = info->hnd->fetch(info, VALLEN(key), skip, &len)) != NULL) { + if((val = info->hnd->fetch(info, VALLEN(key), skip, &len TSRMLS_CC)) != NULL) { RETURN_STRINGL(val, len, 0); } RETURN_FALSE; @@ -461,7 +461,7 @@ int len; DBA_ID_GET1; - fkey = info->hnd->firstkey(info, &len); + fkey = info->hnd->firstkey(info, &len TSRMLS_CC); if(fkey) RETURN_STRINGL(fkey, len, 0); RETURN_FALSE; @@ -476,7 +476,7 @@ int len; DBA_ID_GET1; - nkey = info->hnd->nextkey(info, &len); + nkey = info->hnd->nextkey(info, &len TSRMLS_CC); if(nkey) RETURN_STRINGL(nkey, len, 0); RETURN_FALSE; @@ -491,7 +491,7 @@ DBA_WRITE_CHECK; - if(info->hnd->delete(info, VALLEN(key)) == SUCCESS) + if(info->hnd->delete(info, VALLEN(key) TSRMLS_CC) == SUCCESS) RETURN_TRUE; RETURN_FALSE; } @@ -520,7 +520,7 @@ DBA_ID_GET1; DBA_WRITE_CHECK; - if(info->hnd->optimize(info) == SUCCESS) { + if(info->hnd->optimize(info TSRMLS_CC) == SUCCESS) { RETURN_TRUE; } RETURN_FALSE; @@ -533,7 +533,7 @@ { DBA_ID_GET1; - if(info->hnd->sync(info) == SUCCESS) { + if(info->hnd->sync(info TSRMLS_CC) == SUCCESS) { RETURN_TRUE; } RETURN_FALSE; Index: php4/ext/dba/dba_db2.c diff -u php4/ext/dba/dba_db2.c:1.26 php4/ext/dba/dba_db2.c:1.27 --- php4/ext/dba/dba_db2.c:1.26 Thu Apr 18 08:30:18 2002 +++ php4/ext/dba/dba_db2.c Mon Nov 4 07:27:13 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_db2.c,v 1.26 2002/04/18 12:30:18 derick Exp $ */ +/* $Id: dba_db2.c,v 1.27 2002/11/04 12:27:13 helly Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -158,7 +158,7 @@ } /* we should introduce something like PARAM_PASSTHRU... */ - return dba_nextkey_db2(info, newlen); + return dba_nextkey_db2(info, newlen TSRMLS_CC); } DBA_NEXTKEY_FUNC(db2) Index: php4/ext/dba/dba_db3.c diff -u php4/ext/dba/dba_db3.c:1.17 php4/ext/dba/dba_db3.c:1.18 --- php4/ext/dba/dba_db3.c:1.17 Thu Apr 18 08:30:18 2002 +++ php4/ext/dba/dba_db3.c Mon Nov 4 07:27:13 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_db3.c,v 1.17 2002/04/18 12:30:18 derick Exp $ */ +/* $Id: dba_db3.c,v 1.18 2002/11/04 12:27:13 helly Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -166,7 +166,7 @@ } /* we should introduce something like PARAM_PASSTHRU... */ - return dba_nextkey_db3(info, newlen); + return dba_nextkey_db3(info, newlen TSRMLS_CC); } DBA_NEXTKEY_FUNC(db3) Index: php4/ext/dba/php_dba.h diff -u php4/ext/dba/php_dba.h:1.15 php4/ext/dba/php_dba.h:1.16 --- php4/ext/dba/php_dba.h:1.15 Sun Nov 3 11:43:06 2002 +++ php4/ext/dba/php_dba.h Mon Nov 4 07:27:13 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dba.h,v 1.15 2002/11/03 16:43:06 helly Exp $ */ +/* $Id: php_dba.h,v 1.16 2002/11/04 12:27:13 helly Exp $ */ #ifndef PHP_DBA_H #define PHP_DBA_H @@ -50,23 +50,23 @@ #define DBA_OPEN_FUNC(x) \ int dba_open_##x(dba_info *info TSRMLS_DC) #define DBA_CLOSE_FUNC(x) \ - void dba_close_##x(dba_info *info) + void dba_close_##x(dba_info *info TSRMLS_DC) #define DBA_FETCH_FUNC(x) \ - char *dba_fetch_##x(dba_info *info, char *key, int keylen, int skip, int *newlen) + char *dba_fetch_##x(dba_info *info, char *key, int keylen, int skip, int *newlen TSRMLS_DC) #define DBA_UPDATE_FUNC(x) \ - int dba_update_##x(dba_info *info, char *key, int keylen, char *val, int vallen, int mode) + int dba_update_##x(dba_info *info, char *key, int keylen, char *val, int vallen, int mode TSRMLS_DC) #define DBA_EXISTS_FUNC(x) \ - int dba_exists_##x(dba_info *info, char *key, int keylen) + int dba_exists_##x(dba_info *info, char *key, int keylen TSRMLS_DC) #define DBA_DELETE_FUNC(x) \ - int dba_delete_##x(dba_info *info, char *key, int keylen) + int dba_delete_##x(dba_info *info, char *key, int keylen TSRMLS_DC) #define DBA_FIRSTKEY_FUNC(x) \ - char *dba_firstkey_##x(dba_info *info, int *newlen) + char *dba_firstkey_##x(dba_info *info, int *newlen TSRMLS_DC) #define DBA_NEXTKEY_FUNC(x) \ - char *dba_nextkey_##x(dba_info *info, int *newlen) + char *dba_nextkey_##x(dba_info *info, int *newlen TSRMLS_DC) #define DBA_OPTIMIZE_FUNC(x) \ - int dba_optimize_##x(dba_info *info) + int dba_optimize_##x(dba_info *info TSRMLS_DC) #define DBA_SYNC_FUNC(x) \ - int dba_sync_##x(dba_info *info) + int dba_sync_##x(dba_info *info TSRMLS_DC) #define DBA_FUNCS(x) \ DBA_OPEN_FUNC(x); \