diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-17 02:47:02 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-17 02:47:02 -0500 |
| commit | a4d083550a7273b895b44aac8d2ff7e2fdb1f7d5 (patch) | |
| tree | 6f148433641f8c92d6f1eddcb2199a78dbd111a0 /src/resolve/resolved-link.c | |
| parent | b6d071f1df46eb841ba3f88cdb2b248eaf5f35f8 (diff) | |
| parent | 86e9bb69ae74bd960e1fd427258f41d54240d6d1 (diff) | |
Merge branch 'systemd/parabola' into notsystemd/premove
# Conflicts:
# Makefile.amp
Diffstat (limited to 'src/resolve/resolved-link.c')
| -rw-r--r-- | src/resolve/resolved-link.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c index ea4a007139..13e1f91192 100644 --- a/src/resolve/resolved-link.c +++ b/src/resolve/resolved-link.c @@ -101,8 +101,7 @@ Link *link_free(Link *l) { free(l->state_file); - free(l); - return NULL; + return mfree(l); } void link_allocate_scopes(Link *l) { @@ -698,8 +697,7 @@ LinkAddress *link_address_free(LinkAddress *a) { dns_resource_record_unref(a->llmnr_address_rr); dns_resource_record_unref(a->llmnr_ptr_rr); - free(a); - return NULL; + return mfree(a); } void link_address_add_rrs(LinkAddress *a, bool force_remove) { |