diff options
author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-10-17 07:12:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-17 07:12:20 +0200 |
commit | a7753693547233e4a1d6e10b1a8f6515a477f227 (patch) | |
tree | 3b20f53b931e953f4ed495bb10e90597f3670237 /src/resolve/resolved-dns-query.c | |
parent | 9e7727521ff2e751ee064716ab735016abf72025 (diff) | |
parent | 3b319885c4febb5f7ea9b5ab31c3395548ed6886 (diff) |
Merge pull request #4391 from keszybz/treewide-macros
Use mfree more and add another function to simplify a common set&free pattern
Diffstat (limited to 'src/resolve/resolved-dns-query.c')
-rw-r--r-- | src/resolve/resolved-dns-query.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/resolve/resolved-dns-query.c b/src/resolve/resolved-dns-query.c index 53be18efc6..e03db4d003 100644 --- a/src/resolve/resolved-dns-query.c +++ b/src/resolve/resolved-dns-query.c @@ -83,9 +83,7 @@ DnsQueryCandidate* dns_query_candidate_free(DnsQueryCandidate *c) { if (c->scope) LIST_REMOVE(candidates_by_scope, c->scope->query_candidates, c); - free(c); - - return NULL; + return mfree(c); } static int dns_query_candidate_next_search_domain(DnsQueryCandidate *c) { @@ -421,9 +419,7 @@ DnsQuery *dns_query_free(DnsQuery *q) { q->manager->n_dns_queries--; } - free(q); - - return NULL; + return mfree(q); } int dns_query_new( |