From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 4 Dec 2019 08:44:31 +0000 (+0100)
Subject: - Fix lock type for memory purify log lock deletion.
X-Git-Tag: release-1.9.6rc1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=216747bb171b368a8c522d7b60085fd9977484db;p=thirdparty%2Funbound.git

- Fix lock type for memory purify log lock deletion.
---

diff --git a/daemon/unbound.c b/daemon/unbound.c
index f696b19d3..beffb5700 100644
--- a/daemon/unbound.c
+++ b/daemon/unbound.c
@@ -787,7 +787,7 @@ main(int argc, char* argv[])
 	log_init(NULL, 0, NULL); /* close logfile */
 #ifndef unbound_testbound
 	if(log_get_lock()) {
-		lock_quick_destroy((lock_quick_type*)log_get_lock());
+		lock_basic_destroy((lock_basic_type*)log_get_lock());
 	}
 #endif
 	return 0;
diff --git a/doc/Changelog b/doc/Changelog
index 8d63bad70..21d250348 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+4 December 2019: Wouter
+	- Fix lock type for memory purify log lock deletion.
+
 3 December 2019: Wouter
 	- Merge pull request #124 from rmetrich: Changed log lock
 	  from 'quick' to 'basic' because this is an I/O lock.
diff --git a/testcode/testbound.c b/testcode/testbound.c
index 246bc6735..735cbea62 100644
--- a/testcode/testbound.c
+++ b/testcode/testbound.c
@@ -358,7 +358,7 @@ main(int argc, char* argv[])
 			testbound_selftest();
 			checklock_stop();
 			if(log_get_lock()) {
-				lock_quick_destroy((lock_quick_type*)log_get_lock());
+				lock_basic_destroy((lock_basic_type*)log_get_lock());
 			}
 			exit(0);
 		case '1':
@@ -464,7 +464,7 @@ main(int argc, char* argv[])
 	if(res == 0) {
 		log_info("Testbound Exit Success\n");
 		if(log_get_lock()) {
-			lock_quick_destroy((lock_quick_type*)log_get_lock());
+			lock_basic_destroy((lock_basic_type*)log_get_lock());
 		}
 #ifdef HAVE_PTHREAD
 		/* dlopen frees its thread state (dlopen of gost engine) */
diff --git a/testcode/unitmain.c b/testcode/unitmain.c
index 4b9a39cf8..e8e7a44c7 100644
--- a/testcode/unitmain.c
+++ b/testcode/unitmain.c
@@ -905,7 +905,7 @@ main(int argc, char* argv[])
 	ecs_test();
 #endif /* CLIENT_SUBNET */
 	if(log_get_lock()) {
-		lock_quick_destroy((lock_quick_type*)log_get_lock());
+		lock_basic_destroy((lock_basic_type*)log_get_lock());
 	}
 	checklock_stop();
 	printf("%d checks ok.\n", testcount);