cvs: php4 /ext/db db.c php_db.h

elixer Sat Jan 19 23:55:40 2002 EDT Modified files: /php4/ext/db db.c php_db.h Log: These PHP3_* macros aren't defined in the code, so these haven't been doing anything for some time now (at least since 4.0 was released). So let's go ahead and remove those. # If I missed something obvious, let me know and I will revert the patch. Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.67 php4/ext/db/db.c:1.68 --- php4/ext/db/db.c:1.67 Tue Dec 11 10:28:59 2001 +++ php4/ext/db/db.c Sat Jan 19 23:55:40 2002 @@ -17,11 +17,9 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.67 2001/12/11 15:28:59 sebastian Exp $ */ +/* $Id: db.c,v 1.68 2002/01/20 04:55:40 elixer Exp $ */ #define IS_EXT_MODULE -#if 1 - #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -158,14 +156,6 @@ static int le_db; -#if THREAD_SAFE -DWORD DbmTls; -static int numthreads=0; -#endif - -/*needed for blocking calls in windows*/ -void *dbm_mutex; - /* {{{ php_find_dbm */ dbm_info *php_find_dbm(pval *id TSRMLS_DC) @@ -447,7 +437,7 @@ /* {{{ php_dbm_close */ -int php_dbm_close(zend_rsrc_list_entry *rsrc TSRMLS_DC) +void php_dbm_close(zend_rsrc_list_entry *rsrc TSRMLS_DC) { int ret = 0; dbm_info *info = (dbm_info *)rsrc->ptr; @@ -1161,50 +1151,11 @@ */ PHP_MINIT_FUNCTION(db) { -#if defined(THREAD_SAFE) - dbm_global_struct *dbm_globals; - PHP_MUTEX_ALLOC(dbm_mutex); - PHP_MUTEX_LOCK(dbm_mutex); - numthreads++; - if (numthreads==1){ - if (!PHP3_TLS_PROC_STARTUP(DbmTls)){ - PHP_MUTEX_UNLOCK(dbm_mutex); - PHP_MUTEX_FREE(dbm_mutex); - return FAILURE; - } - } - PHP_MUTEX_UNLOCK(dbm_mutex); - if(!PHP3_TLS_THREAD_INIT(DbmTls, dbm_globals, dbm_global_struct)){ - PHP_MUTEX_FREE(dbm_mutex); - return FAILURE; - } -#endif - le_db = zend_register_list_destructors_ex(php_dbm_close, NULL, "dbm", module_number); return SUCCESS; } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ -static PHP_MSHUTDOWN_FUNCTION(db) -{ -#ifdef THREAD_SAFE - PHP3_TLS_THREAD_FREE(dbm_globals); - PHP_MUTEX_LOCK(dbm_mutex); - numthreads--; - if (numthreads<1) { - PHP3_TLS_PROC_SHUTDOWN(DbmTls); - PHP_MUTEX_UNLOCK(dbm_mutex); - PHP_MUTEX_FREE(dbm_mutex); - return SUCCESS; - } - PHP_MUTEX_UNLOCK(dbm_mutex); -#endif - return SUCCESS; -} -/* }}} */ - /* {{{ PHP_RINIT_FUNCTION */ PHP_RINIT_FUNCTION(db) @@ -1234,22 +1185,20 @@ /* }}} */ zend_module_entry dbm_module_entry = { - STANDARD_MODULE_HEADER, + STANDARD_MODULE_HEADER, "db", - dbm_functions, - PHP_MINIT(db), - PHP_MSHUTDOWN(db), - PHP_RINIT(db), - NULL, - PHP_MINFO(db), - NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + dbm_functions, + PHP_MINIT(db), + NULL, + PHP_RINIT(db), + NULL, + PHP_MINFO(db), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_DB ZEND_GET_MODULE(dbm) -#endif - #endif /* Index: php4/ext/db/php_db.h diff -u php4/ext/db/php_db.h:1.14 php4/ext/db/php_db.h:1.15 --- php4/ext/db/php_db.h:1.14 Tue Dec 11 10:29:00 2001 +++ php4/ext/db/php_db.h Sat Jan 19 23:55:40 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_db.h,v 1.14 2001/12/11 15:29:00 sebastian Exp $ */ +/* $Id: php_db.h,v 1.15 2002/01/20 04:55:40 elixer Exp $ */ #ifndef PHP_DB_H @@ -52,7 +52,7 @@ #endif dbm_info *php_find_dbm(pval *id TSRMLS_DC); -int php_dbm_close(zend_rsrc_list_entry *rsrc TSRMLS_DC); +void php_dbm_close(zend_rsrc_list_entry *rsrc TSRMLS_DC); dbm_info *php_dbm_open(char *filename, char *mode TSRMLS_DC); int php_dbm_insert(dbm_info *info, char *key, char *value TSRMLS_DC); char *php_dbm_fetch(dbm_info *info, char *key TSRMLS_DC);