From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 4 May 2025 15:43:09 +0000 (+0200)
Subject: string-util: Remove utf8.h and alloc-util.h includes
X-Git-Tag: v258-rc1~688
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4a08721c3785ebaaa95e4b71ba61299a900a1f3;p=thirdparty%2Fsystemd.git

string-util: Remove utf8.h and alloc-util.h includes
---

diff --git a/src/basic/confidential-virt.c b/src/basic/confidential-virt.c
index 9ca213f30d4..920a9dd36af 100644
--- a/src/basic/confidential-virt.c
+++ b/src/basic/confidential-virt.c
@@ -9,6 +9,7 @@
 #include <threads.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "confidential-virt.h"
 #include "confidential-virt-fundamental.h"
 #include "errno-util.h"
diff --git a/src/basic/percent-util.c b/src/basic/percent-util.c
index c205b10b09c..b2625d0bb27 100644
--- a/src/basic/percent-util.c
+++ b/src/basic/percent-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "parse-util.h"
 #include "percent-util.h"
 #include "string-util.h"
diff --git a/src/basic/sha256.c b/src/basic/sha256.c
index f0116957510..1017a550fca 100644
--- a/src/basic/sha256.c
+++ b/src/basic/sha256.c
@@ -2,6 +2,7 @@
 
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "hexdecoct.h"
 #include "macro.h"
 #include "sha256.h"
diff --git a/src/basic/string-util.c b/src/basic/string-util.c
index a836363e484..d98d2f44d83 100644
--- a/src/basic/string-util.c
+++ b/src/basic/string-util.c
@@ -1113,6 +1113,19 @@ bool string_is_safe(const char *p) {
         return true;
 }
 
+bool string_is_safe_ascii(const char *p) {
+        return ascii_is_valid(p) && string_is_safe(p);
+}
+
+char* str_realloc(char *p) {
+        /* Reallocate *p to actual size. Ignore failure, and return the original string on error. */
+
+        if (!p)
+                return NULL;
+
+        return realloc(p, strlen(p) + 1) ?: p;
+}
+
 char* string_erase(char *x) {
         if (!x)
                 return NULL;
diff --git a/src/basic/string-util.h b/src/basic/string-util.h
index 91e63c9b126..3679af2d707 100644
--- a/src/basic/string-util.h
+++ b/src/basic/string-util.h
@@ -5,10 +5,8 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "alloc-util.h"
 #include "macro.h"
 #include "string-util-fundamental.h"
-#include "utf8.h"
 
 /* What is interpreted as whitespace? */
 #define WHITESPACE          " \t\n\r"
@@ -225,9 +223,7 @@ static inline int strdup_to(char **ret, const char *src) {
 }
 
 bool string_is_safe(const char *p) _pure_;
-static inline bool string_is_safe_ascii(const char *p) {
-        return ascii_is_valid(p) && string_is_safe(p);
-}
+bool string_is_safe_ascii(const char *p) _pure_;
 
 DISABLE_WARNING_STRINGOP_TRUNCATION;
 static inline void strncpy_exact(char *buf, const char *src, size_t buf_len) {
@@ -254,15 +250,7 @@ static inline void* memory_startswith_no_case(const void *p, size_t sz, const ch
         return (uint8_t*) p + n;
 }
 
-static inline char* str_realloc(char *p) {
-        /* Reallocate *p to actual size. Ignore failure, and return the original string on error. */
-
-        if (!p)
-                return NULL;
-
-        return realloc(p, strlen(p) + 1) ?: p;
-}
-
+char* str_realloc(char *p);
 char* string_erase(char *x);
 
 int string_truncate_lines(const char *s, size_t n_lines, char **ret);
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 2d5e7dcefc9..6f1f17b77df 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -52,6 +52,7 @@
 #include "terminal-util.h"
 #include "time-util.h"
 #include "user-util.h"
+#include "utf8.h"
 
 static volatile unsigned cached_columns = 0;
 static volatile unsigned cached_lines = 0;
diff --git a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-util.c b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-util.c
index c440de336ee..46e8e5532c2 100644
--- a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-util.c
+++ b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "cryptsetup-token-util.h"
 #include "string-util.h"
 
diff --git a/src/cryptsetup/cryptsetup-tokens/luks2-pkcs11.c b/src/cryptsetup/cryptsetup-tokens/luks2-pkcs11.c
index 1f1d9e48d4b..9f11f81c4ac 100644
--- a/src/cryptsetup/cryptsetup-tokens/luks2-pkcs11.c
+++ b/src/cryptsetup/cryptsetup-tokens/luks2-pkcs11.c
@@ -5,6 +5,7 @@
 
 #include "sd-json.h"
 
+#include "alloc-util.h"
 #include "cryptsetup-token-util.h"
 #include "escape.h"
 #include "hexdecoct.h"
diff --git a/src/fuzz/fuzz-varlink-idl.c b/src/fuzz/fuzz-varlink-idl.c
index 1ed34e4ce9f..689cdf167bc 100644
--- a/src/fuzz/fuzz-varlink-idl.c
+++ b/src/fuzz/fuzz-varlink-idl.c
@@ -4,6 +4,7 @@
 
 #include "sd-varlink-idl.h"
 
+#include "alloc-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fuzz.h"
diff --git a/src/libsystemd/sd-bus/bus-convenience.c b/src/libsystemd/sd-bus/bus-convenience.c
index a6533815e83..b59338a5d14 100644
--- a/src/libsystemd/sd-bus/bus-convenience.c
+++ b/src/libsystemd/sd-bus/bus-convenience.c
@@ -3,6 +3,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-signature.h"
diff --git a/src/locale/xkbcommon-util.c b/src/locale/xkbcommon-util.c
index 846c6e0a931..8d0de9b4318 100644
--- a/src/locale/xkbcommon-util.c
+++ b/src/locale/xkbcommon-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "dlfcn-util.h"
 #include "log.h"
 #include "macro.h"
diff --git a/src/resolve/resolved-dnssd.c b/src/resolve/resolved-dnssd.c
index 55cbfcef7fc..e2a57155dc0 100644
--- a/src/resolve/resolved-dnssd.c
+++ b/src/resolve/resolved-dnssd.c
@@ -13,6 +13,7 @@
 #include "resolved-manager.h"
 #include "specifier.h"
 #include "strv.h"
+#include "utf8.h"
 
 #define DNSSD_SERVICE_DIRS ((const char* const*) CONF_PATHS_STRV("systemd/dnssd"))
 
diff --git a/src/shared/coredump-util.c b/src/shared/coredump-util.c
index 77573a95c01..9d18cf13010 100644
--- a/src/shared/coredump-util.c
+++ b/src/shared/coredump-util.c
@@ -2,6 +2,7 @@
 
 #include <elf.h>
 
+#include "alloc-util.h"
 #include "coredump-util.h"
 #include "extract-word.h"
 #include "fileio.h"
diff --git a/src/shared/daemon-util.c b/src/shared/daemon-util.c
index 85d94336263..e189e401321 100644
--- a/src/shared/daemon-util.c
+++ b/src/shared/daemon-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "daemon-util.h"
 #include "fd-util.h"
 #include "log.h"
diff --git a/src/shared/factory-reset.c b/src/shared/factory-reset.c
index 39f4f2578a9..7cabb4b0091 100644
--- a/src/shared/factory-reset.c
+++ b/src/shared/factory-reset.c
@@ -2,6 +2,7 @@
 
 #include "sd-json.h"
 
+#include "alloc-util.h"
 #include "efivars.h"
 #include "env-util.h"
 #include "factory-reset.h"
diff --git a/src/shared/varlink-io.systemd.service.c b/src/shared/varlink-io.systemd.service.c
index 7dd15c6e40c..d130f0df51a 100644
--- a/src/shared/varlink-io.systemd.service.c
+++ b/src/shared/varlink-io.systemd.service.c
@@ -6,6 +6,7 @@
 #include "json-util.h"
 #include "log.h"
 #include "strv.h"
+#include "utf8.h"
 #include "varlink-io.systemd.service.h"
 
 static SD_VARLINK_DEFINE_METHOD(Ping);
diff --git a/src/sysupdate/sysupdated.c b/src/sysupdate/sysupdated.c
index 7dd2d981e0c..e75bfb4a16b 100644
--- a/src/sysupdate/sysupdated.c
+++ b/src/sysupdate/sysupdated.c
@@ -33,6 +33,7 @@
 #include "socket-util.h"
 #include "string-table.h"
 #include "sysupdate-util.h"
+#include "utf8.h"
 
 #define FEATURES_DROPIN_NAME "systemd-sysupdate-enabled"
 
diff --git a/src/test/nss-test-util.c b/src/test/nss-test-util.c
index 7b17c213674..11cc7e4f0b5 100644
--- a/src/test/nss-test-util.c
+++ b/src/test/nss-test-util.c
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "log.h"
 #include "nss-test-util.h"
 #include "string-util.h"
diff --git a/src/test/test-build-path.c b/src/test/test-build-path.c
index 661b5fc9e6a..4b5f35298c2 100644
--- a/src/test/test-build-path.c
+++ b/src/test/test-build-path.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "build-path.h"
 #include "log.h"
 #include "string-util.h"
diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c
index e9713dc1723..1034349e872 100644
--- a/src/vmspawn/vmspawn.c
+++ b/src/vmspawn/vmspawn.c
@@ -74,6 +74,7 @@
 #include "time-util.h"
 #include "tmpfile-util.h"
 #include "unit-name.h"
+#include "utf8.h"
 #include "vmspawn-mount.h"
 #include "vmspawn-register.h"
 #include "vmspawn-scope.h"