Merge pull request #23124 from yuwata/fixes-for-post-merge-review

Fixes for post merge review

src/shared/efi-api.c

@@ -546,11 +546,3 @@ bool efi_has_tpm2(void) {
 }
 
 #endif
-
-char *efi_tilt_backslashes(char *s) {
-        for (char *p = s; *p; p++)
-                if (*p == '\\')
-                        *p = '/';
-
-        return s;
-}

src/shared/efi-api.h

@@ -3,6 +3,7 @@
 
 #include "efivars-fundamental.h"
 #include "efivars.h"
+#include "string-util.h"
 
 /* Various calls for interfacing with EFI variables from the official UEFI specs. */
 
@@ -65,4 +66,6 @@ static inline bool efi_has_tpm2(void) {
 
 #endif
 
-char *efi_tilt_backslashes(char *s);
+static inline char *efi_tilt_backslashes(char *s) {
+        return string_replace_char(s, '\\', '/');
+}

src/shared/firewall-util-nft.c

@@ -31,7 +31,7 @@
 
 static int nfnl_netlink_sendv(
                 sd_netlink *nfnl,
-                sd_netlink_message **messages,
+                sd_netlink_message *messages[static 1],
                 size_t msgcount) {
 
         _cleanup_free_ uint32_t *serial = NULL;