From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 18 Dec 2015 18:44:15 +0000 (+0100)
Subject: resolved: rename dns_cache_item_remove_and_free() → _unlink_and_free()
X-Git-Tag: v229~201^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39963f1123b3c192dd72e88d5403e4d39deabcba;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/resolve/resolved-dns-cache.c b/src/resolve/resolved-dns-cache.c
index c0bfcce7cd5..0aacc74e5e4 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;