]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network/sysctl: use wrapped free functions
authorYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 16 Sep 2024 00:33:58 +0000 (09:33 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 16 Sep 2024 05:36:54 +0000 (14:36 +0900)
No functional change, just refactoring.

Follow-up for 6d9ef22acdeac4b429efb75164341233955484af.

src/network/networkd-sysctl.c

index 4c83a6c9a9c5d33dab5db351e16deeadb53643d8..667c4408dd9fb1c263a72ebf98e051d4e26b9cd5 100644 (file)
@@ -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);
 }