From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 16 Sep 2024 00:33:58 +0000 (+0900)
Subject: network/sysctl: use wrapped free functions
X-Git-Tag: v257-rc1~421^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9295c7ae09e4151f6fa0ddebb3a50463927738d8;p=thirdparty%2Fsystemd.git

network/sysctl: use wrapped free functions

No functional change, just refactoring.

Follow-up for 6d9ef22acdeac4b429efb75164341233955484af.
---

diff --git a/src/network/networkd-sysctl.c b/src/network/networkd-sysctl.c
index 4c83a6c9a9c..667c4408dd9 100644
--- a/src/network/networkd-sysctl.c
+++ b/src/network/networkd-sysctl.c
@@ -163,22 +163,9 @@ void sysctl_remove_monitor(Manager *manager) {
         assert(manager);
 
         manager->sysctl_event_source = sd_event_source_disable_unref(manager->sysctl_event_source);
-
-        if (manager->sysctl_buffer) {
-                sym_ring_buffer__free(manager->sysctl_buffer);
-                manager->sysctl_buffer = NULL;
-        }
-
-        if (manager->sysctl_link) {
-                sym_bpf_link__destroy(manager->sysctl_link);
-                manager->sysctl_link = NULL;
-        }
-
-        if (manager->sysctl_skel) {
-                sysctl_monitor_bpf__destroy(manager->sysctl_skel);
-                manager->sysctl_skel = NULL;
-        }
-
+        manager->sysctl_buffer = rb_free(manager->sysctl_buffer);
+        manager->sysctl_link = bpf_link_free(manager->sysctl_link);
+        manager->sysctl_skel = sysctl_monitor_bpf_free(manager->sysctl_skel);
         manager->cgroup_fd = safe_close(manager->cgroup_fd);
 }