From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 13 Nov 2001 18:16:07 +0000 (+0000)
Subject: rm currenttime_mutex.
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~871
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0f10bed0110d804fe07654765ca11fce7b8b0c78;p=openldap

rm currenttime_mutex.
trival other cleanup.
---

diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c
index 29a16f2292..07f7aacd80 100644
--- a/servers/slapd/ad.c
+++ b/servers/slapd/ad.c
@@ -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;
diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index cfd38d77a2..0d29037e90 100644
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -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;
-}
diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index cd689d5534..63457cad41 100644
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -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;