summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-12-18 19:44:15 +0100
committerLennart Poettering <lennart@poettering.net>2015-12-18 19:44:15 +0100
commit39963f1123b3c192dd72e88d5403e4d39deabcba (patch)
tree716b2340194fa47403bad770af6e5183184c3369
parent2dda578f1e729ff906820936b65474967683aeda (diff)
resolved: rename dns_cache_item_remove_and_free() → _unlink_and_free()
In most of the other call, we called similar functions that remove the data structure link-ups to other objects "unlink", hence we should here, too.
-rw-r--r--src/resolve/resolved-dns-cache.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resolve/resolved-dns-cache.c b/src/resolve/resolved-dns-cache.c
index c0bfcce7cd..0aacc74e5e 100644
--- a/src/resolve/resolved-dns-cache.c
+++ b/src/resolve/resolved-dns-cache.c
@@ -68,7 +68,7 @@ static void dns_cache_item_free(DnsCacheItem *i) {
DEFINE_TRIVIAL_CLEANUP_FUNC(DnsCacheItem*, dns_cache_item_free);
-static void dns_cache_item_remove_and_free(DnsCache *c, DnsCacheItem *i) {
+static void dns_cache_item_unlink_and_free(DnsCache *c, DnsCacheItem *i) {
DnsCacheItem *first;
assert(c);
@@ -99,7 +99,7 @@ static bool dns_cache_remove_by_rr(DnsCache *c, DnsResourceRecord *rr) {
if (r < 0)
return r;
if (r > 0) {
- dns_cache_item_remove_and_free(c, i);
+ dns_cache_item_unlink_and_free(c, i);
return true;
}
}
@@ -195,7 +195,7 @@ void dns_cache_prune(DnsCache *c) {
* either remove only this one RR or the whole
* RRset */
if (i->shared_owner)
- dns_cache_item_remove_and_free(c, i);
+ dns_cache_item_unlink_and_free(c, i);
else {
_cleanup_(dns_resource_key_unrefp) DnsResourceKey *key = NULL;