diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2023-03-23 14:08:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-23 14:08:29 +0200 |
| commit | 6927446645221898256a6ec37653bb31a301db72 (patch) | |
| tree | 3039c1a7b7ee98a0da74fe99f7f9ef571825a3fa /pimd/pim_msdp.c | |
| parent | 9cc377d4d7ccae8a318d0162c5d0d6a6754d8b0a (diff) | |
| parent | d8bc11a592110abdd14d11dfcb2ce623653ecab5 (diff) | |
Merge pull request #13074 from donaldsharp/hash_clean_and_free
*: Add a hash_clean_and_free() function
Diffstat (limited to 'pimd/pim_msdp.c')
| -rw-r--r-- | pimd/pim_msdp.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c index dfa5ffeeec..9d29a33a52 100644 --- a/pimd/pim_msdp.c +++ b/pimd/pim_msdp.c @@ -1367,21 +1367,13 @@ void pim_msdp_exit(struct pim_instance *pim) while ((mg = SLIST_FIRST(&pim->msdp.mglist)) != NULL) pim_msdp_mg_free(pim, &mg); - if (pim->msdp.peer_hash) { - hash_clean(pim->msdp.peer_hash, NULL); - hash_free(pim->msdp.peer_hash); - pim->msdp.peer_hash = NULL; - } + hash_clean_and_free(&pim->msdp.peer_hash, NULL); if (pim->msdp.peer_list) { list_delete(&pim->msdp.peer_list); } - if (pim->msdp.sa_hash) { - hash_clean(pim->msdp.sa_hash, NULL); - hash_free(pim->msdp.sa_hash); - pim->msdp.sa_hash = NULL; - } + hash_clean_and_free(&pim->msdp.sa_hash, NULL); if (pim->msdp.sa_list) { list_delete(&pim->msdp.sa_list); |