From 64753f354d762e0f9cb641c48256011503408a44 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 30 Sep 2020 00:45:19 +0900 Subject: [PATCH] network: make neighbor_free() return NULL --- src/network/networkd-neighbor.c | 6 +++--- src/network/networkd-neighbor.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/network/networkd-neighbor.c b/src/network/networkd-neighbor.c index 908fc1c11c..c14c8f7e06 100644 --- a/src/network/networkd-neighbor.c +++ b/src/network/networkd-neighbor.c @@ -9,9 +9,9 @@ #include "networkd-network.h" #include "set.h" -void neighbor_free(Neighbor *neighbor) { +Neighbor *neighbor_free(Neighbor *neighbor) { if (!neighbor) - return; + return NULL; if (neighbor->network) { assert(neighbor->section); @@ -25,7 +25,7 @@ void neighbor_free(Neighbor *neighbor) { set_remove(neighbor->link->neighbors_foreign, neighbor); } - free(neighbor); + return mfree(neighbor); } DEFINE_NETWORK_SECTION_FUNCTIONS(Neighbor, neighbor_free); diff --git a/src/network/networkd-neighbor.h b/src/network/networkd-neighbor.h index 0c3dfc8303..f40fdccc48 100644 --- a/src/network/networkd-neighbor.h +++ b/src/network/networkd-neighbor.h @@ -30,7 +30,7 @@ typedef struct Neighbor { size_t lladdr_size; } Neighbor; -void neighbor_free(Neighbor *neighbor); +Neighbor *neighbor_free(Neighbor *neighbor); void network_verify_neighbors(Network *network);