From 7818f8589adf34101e70ad7340acd03baa4a4def Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 2 Oct 2020 12:18:37 +0900 Subject: [PATCH] network: make address_free() return NULL --- src/network/networkd-address.c | 6 +++--- src/network/networkd-address.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index 3f985c849f..d14da8195e 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -110,9 +110,9 @@ static int address_new_static(Network *network, const char *filename, unsigned s return 0; } -void address_free(Address *address) { +Address *address_free(Address *address) { if (!address) - return; + return NULL; if (address->network) { LIST_REMOVE(addresses, address->network->static_addresses, address); @@ -149,7 +149,7 @@ void address_free(Address *address) { network_config_section_free(address->section); free(address->label); - free(address); + return mfree(address); } static uint32_t address_prefix(const Address *a) { diff --git a/src/network/networkd-address.h b/src/network/networkd-address.h index a78fadc885..097cafc315 100644 --- a/src/network/networkd-address.h +++ b/src/network/networkd-address.h @@ -57,7 +57,7 @@ struct Address { }; int address_new(Address **ret); -void address_free(Address *address); +Address *address_free(Address *address); int address_add_foreign(Link *link, int family, const union in_addr_union *in_addr, unsigned char prefixlen, Address **ret); int address_add(Link *link, int family, const union in_addr_union *in_addr, unsigned char prefixlen, Address **ret); int address_get(Link *link, int family, const union in_addr_union *in_addr, unsigned char prefixlen, Address **ret);