- Fix lock type for memory purify log lock deletion.

diff --git a/daemon/unbound.c b/daemon/unbound.c
index f696b19d39ef28a5c65272c915077aa158ca918b..beffb57005fa0bb0af170628be3697bb32916ab7 100644 (file)
--- 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 8d63bad70baffdf2949abff0f169b8bee215306e..21d25034827962fb3110c0aba3efaf745b11e392 100644 (file)
--- 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 246bc6735b450aac4fb19f3816289b1e1dd23224..735cbea62d71d2c86ea7a706f8c099558f465e32 100644 (file)
--- 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 4b9a39cf8dde4ffc9b0102f97d7fa4dc94fa44e5..e8e7a44c7cb60e31035aaa006845157220e3b192 100644 (file)
--- 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);