summaryrefslogtreecommitdiff
path: root/lib/thread.c
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas@opensourcerouting.org>2023-03-23 14:08:29 +0200
committerGitHub <noreply@github.com>2023-03-23 14:08:29 +0200
commit6927446645221898256a6ec37653bb31a301db72 (patch)
tree3039c1a7b7ee98a0da74fe99f7f9ef571825a3fa /lib/thread.c
parent9cc377d4d7ccae8a318d0162c5d0d6a6754d8b0a (diff)
parentd8bc11a592110abdd14d11dfcb2ce623653ecab5 (diff)
Merge pull request #13074 from donaldsharp/hash_clean_and_free
*: Add a hash_clean_and_free() function
Diffstat (limited to 'lib/thread.c')
-rw-r--r--lib/thread.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/thread.c b/lib/thread.c
index 8324783a7b..87ad3d8823 100644
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -724,9 +724,7 @@ void thread_master_free(struct thread_master *m)
list_delete(&m->cancel_req);
m->cancel_req = NULL;
- hash_clean(m->cpu_record, cpu_record_hash_free);
- hash_free(m->cpu_record);
- m->cpu_record = NULL;
+ hash_clean_and_free(&m->cpu_record, cpu_record_hash_free);
XFREE(MTYPE_THREAD_MASTER, m->name);
XFREE(MTYPE_THREAD_MASTER, m->handler.pfds);