From: Matteo Croce <teknoraver@meta.com>
Date: Thu, 12 Sep 2024 17:17:24 +0000 (+0200)
Subject: minor fixups for #32212
X-Git-Tag: v257-rc1~454
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64e03ca8bf0a599f22ebf5957a2edef8dfb47279;p=thirdparty%2Fsystemd.git

minor fixups for #32212

Fix minor post merge comments
---

diff --git a/src/basic/sysctl-util.c b/src/basic/sysctl-util.c
index dfb99e18969..8a73dc6b3ed 100644
--- a/src/basic/sysctl-util.c
+++ b/src/basic/sysctl-util.c
@@ -65,8 +65,11 @@ static int shadow_update(Hashmap **shadow, const char *property, const char *val
         cur_v = hashmap_remove2(*shadow, k, (void**)&cur_k);
 
         r = hashmap_ensure_put(shadow, &path_hash_ops_free_free, k, v);
-        if (r < 0)
+        if (r < 0) {
+                assert(r != -EEXIST);
+
                 return r;
+        }
 
         TAKE_PTR(k);
         TAKE_PTR(v);
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 6063834a203..9925f3c25ae 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -704,11 +704,11 @@ int manager_start(Manager *m) {
          * Drop the capabilities here, regardless if the load succeeds or not. */
         r = drop_capability(CAP_SYS_ADMIN);
         if (r < 0)
-                log_warning_errno(r, "Failed to drop CAP_SYS_ADMIN: %m, ignoring.");
+                log_warning_errno(r, "Failed to drop CAP_SYS_ADMIN, ignoring: %m.");
 
         r = drop_capability(CAP_BPF);
         if (r < 0)
-                log_warning_errno(r, "Failed to drop CAP_BPF: %m, ignoring.");
+                log_warning_errno(r, "Failed to drop CAP_BPF, ignoring: %m.");
 
         manager_set_sysctl(m);
 
diff --git a/src/network/networkd-sysctl.c b/src/network/networkd-sysctl.c
index b85f0ca568b..d61c208f840 100644
--- a/src/network/networkd-sysctl.c
+++ b/src/network/networkd-sysctl.c
@@ -28,12 +28,12 @@
 #include "bpf/sysctl_monitor/sysctl-monitor-skel.h"
 #include "bpf/sysctl_monitor/sysctl-write-event.h"
 
-static struct sysctl_monitor_bpf *sysctl_monitor_bpf_free(struct sysctl_monitor_bpf *obj) {
+static struct sysctl_monitor_bpf* sysctl_monitor_bpf_free(struct sysctl_monitor_bpf *obj) {
         sysctl_monitor_bpf__destroy(obj);
         return NULL;
 }
 
-static struct ring_buffer *rb_free(struct ring_buffer *rb) {
+static struct ring_buffer* rb_free(struct ring_buffer *rb) {
         sym_ring_buffer__free(rb);
         return NULL;
 }