summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2020-09-30 00:45:19 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2020-10-07 02:44:42 +0900
commit64753f354d762e0f9cb641c48256011503408a44 (patch)
treee7ab5889b8b0277bcfa940df07b7b65b9707e886
parent78ada14f257991635d2cba68e1232cda0f4617e2 (diff)
downloadsystemd-64753f354d762e0f9cb641c48256011503408a44.tar.gz
network: make neighbor_free() return NULL
-rw-r--r--src/network/networkd-neighbor.c6
-rw-r--r--src/network/networkd-neighbor.h2
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);