upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up zoneinfo when freeing the entry. This makes more sense, since

Browse source 
we will always want to do this anyway, and less code duplication means less
places to forget to do it.
This commit is contained in:
Michael Graff 1999-10-19 21:42:56 +00:00
parent f00d96a15c
commit 3f6a666894
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/dns/adb.c
View file

@ -410,7 +410,6 @@ dec_entry_refcnt(dns_adb_t *adb, dns_adbentry_t *entry, isc_boolean_t lock)
{
int bucket;
isc_boolean_t destroy_entry;
dns_adbzoneinfo_t *zi;
bucket = entry->lock_bucket;
@ -433,12 +432,6 @@ dec_entry_refcnt(dns_adb_t *adb, dns_adbentry_t *entry, isc_boolean_t lock)
return;
entry->lock_bucket = DNS_ADB_INVALIDBUCKET;
zi = ISC_LIST_HEAD(entry->zoneinfo);
while (zi != NULL) {
ISC_LIST_UNLINK(entry->zoneinfo, zi, link);
free_adbzoneinfo(adb, &zi);
zi = ISC_LIST_HEAD(entry->zoneinfo);
}
free_adbentry(adb, &entry);
}
@ -586,6 +579,7 @@ static inline void
free_adbentry(dns_adb_t *adb, dns_adbentry_t **entry)
{
dns_adbentry_t *e;
dns_adbzoneinfo_t *zi;
INSIST(entry != NULL && DNS_ADBENTRY_VALID(*entry));
e = *entry;
@ -597,6 +591,14 @@ free_adbentry(dns_adb_t *adb, dns_adbentry_t **entry)
INSIST(!ISC_LINK_LINKED(e, link));
e->magic = 0;
zi = ISC_LIST_HEAD(e->zoneinfo);
while (zi != NULL) {
ISC_LIST_UNLINK(e->zoneinfo, zi, link);
free_adbzoneinfo(adb, &zi);
zi = ISC_LIST_HEAD(e->zoneinfo);
}
isc_mempool_put(adb->emp, e);
}