php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-25 00:48:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

These PHP3_* macros aren't defined in the code, so these haven't been doing

Browse Source 
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.
This commit is contained in:
Sean Bright
2002-01-20 04:55:40 +00:00
parent ac1446fe1d
commit cbedeea53c
2 changed files with 11 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/db/db.c
+10 -61
View File
@@ -20,8 +20,6 @@
/* $Id$ */
#define IS_EXT_MODULE
#if 1
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -158,14 +156,6 @@ datum flatfile_nextkey(FILE *dbf);
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_FUNCTION(dbmclose)
/* {{{ 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 @@ datum flatfile_nextkey(FILE *dbf) {
*/
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,24 +1185,22 @@ function_entry dbm_functions[] = {
/* }}} */
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
/*
* Local variables:
* tab-width: 4
ext/db/php_db.h
+1 -1
View File
@@ -52,7 +52,7 @@ typedef struct dbm_info {
#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);