mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

rm currenttime_mutex.

Browse Source 
trival other cleanup.
This commit is contained in:
Kurt Zeilenga 2001-11-13 18:16:07 +00:00
parent 8c16d30087
commit 0f10bed011
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
servers/slapd/ad.c
View File

@ -91,14 +91,14 @@ int slap_bv2ad(
if (options != NULL) *options = ';';
if( desc.ad_type == NULL ) {
*text = "attribute type undefined";
return rtn;
}
if (options != NULL)
if (options != NULL) {
desc.ad_cname.bv_len = options - name;
else
} else {
desc.ad_cname.bv_len = bv->bv_len;
}
desc.ad_flags = SLAP_DESC_NONE;
desc.ad_lang.bv_len = 0;

13
servers/slapd/init.c
View File

@ -65,8 +65,6 @@ ldap_pvt_thread_mutex_t replog_mutex;
static const char* slap_name = NULL;
int slapMode = SLAP_UNDEFINED_MODE;
static ldap_pvt_thread_mutex_t currenttime_mutex;
int
slap_init( int mode, const char *name )
{
@ -111,7 +109,6 @@ slap_init( int mode, const char *name )
ldap_pvt_thread_pool_init(&connection_pool, SLAP_MAX_WORKER_THREADS, 0);
ldap_pvt_thread_mutex_init( &currenttime_mutex );
ldap_pvt_thread_mutex_init( &entry2str_mutex );
ldap_pvt_thread_mutex_init( &replog_mutex );
ldap_pvt_thread_mutex_init( &num_ops_mutex );
@ -211,13 +208,3 @@ int slap_destroy(void)
/* should destory the above mutex */
return rc;
}
/* should create a utils.c for these */
time_t slap_get_time(void)
{
time_t t;
ldap_pvt_thread_mutex_lock( &currenttime_mutex );
time( &t );
ldap_pvt_thread_mutex_unlock( &currenttime_mutex );
return t;
}

3
servers/slapd/proto-slap.h
View File

@ -883,7 +883,8 @@ LDAP_SLAPD_F (char *) slapd_args_file;
LDAP_SLAPD_F (char) **g_argv;
LDAP_SLAPD_F (time_t) starttime;
LDAP_SLAPD_F (time_t) slap_get_time LDAP_P((void));
/* use time(3) -- no mutex */
#define slap_get_time() time( NULL )
LDAP_SLAPD_F (ldap_pvt_thread_pool_t) connection_pool;