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-rr.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-rr.c')
| -rw-r--r-- | src/resolve/resolved-dns-rr.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/resolve/resolved-dns-rr.c b/src/resolve/resolved-dns-rr.c index 5687588a7d..87e4abec6e 100644 --- a/src/resolve/resolved-dns-rr.c +++ b/src/resolve/resolved-dns-rr.c @@ -73,10 +73,8 @@ DnsResourceKey* dns_resource_key_new_redirect(const DnsResourceKey *key, const D return dns_resource_key_ref((DnsResourceKey*) key); k = dns_resource_key_new_consume(key->class, key->type, destination); - if (!k) { - free(destination); - return NULL; - } + if (!k) + return mfree(destination); return k; } @@ -513,9 +511,7 @@ DnsResourceRecord* dns_resource_record_unref(DnsResourceRecord *rr) { } free(rr->to_string); - free(rr); - - return NULL; + return mfree(rr); } int dns_resource_record_new_reverse(DnsResourceRecord **ret, int family, const union in_addr_union *address, const char *hostname) { |