minor fixups for #32212

Fix minor post merge comments

diff --git a/src/basic/sysctl-util.c b/src/basic/sysctl-util.c
index dfb99e18969bf7a3765f57709f201620535c776c..8a73dc6b3ed879f0d099e472de024c4128dd323f 100644 (file)
--- 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 6063834a2033772fec3ead737b8ea01db1ce09bc..9925f3c25ae0ea8a9ba6a83c18c5ae956b222e01 100644 (file)
--- 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 b85f0ca568bf1f05084a5172add0098e2edfca09..d61c208f84013342f3a2994fcff81b8045282b55 100644 (file)
--- 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;
 }