util: split out nulstr related stuff to nulstr-util.[ch]

diff --git a/src/analyze/analyze-security.c b/src/analyze/analyze-security.c
index 9e4cac6e294d76e347109ff48fda4a368c8b474f..a978ed6da86e124554460599896fdb61b230a4ad 100644 (file)
--- a/src/analyze/analyze-security.c
+++ b/src/analyze/analyze-security.c
@@ -13,6 +13,7 @@
 #include "locale-util.h"
 #include "macro.h"
 #include "missing.h"
+#include "nulstr-util.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "pretty-print.h"

diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index f838daada8b5f522308af54b7e2e6eceec66145c..299c5917bca0f29f23d1ef64f2588fee1ba065d4 100644 (file)
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -29,6 +29,7 @@
 #include "locale-util.h"
 #include "log.h"
 #include "main-func.h"
+#include "nulstr-util.h"
 #include "pager.h"
 #include "parse-util.h"
 #include "path-util.h"

diff --git a/src/basic/kbd-util.c b/src/basic/kbd-util.c
index f178b5dfeabfd338cc4d55702bd76521ef7eb8a5..17d4022dbe74c24a3ea53003bc6babd8fc8579b8 100644 (file)
--- a/src/basic/kbd-util.c
+++ b/src/basic/kbd-util.c
@@ -4,6 +4,7 @@
 
 #include "kbd-util.h"
 #include "log.h"
+#include "nulstr-util.h"
 #include "path-util.h"
 #include "set.h"
 #include "string-util.h"

diff --git a/src/basic/meson.build b/src/basic/meson.build
index 82b245c90b557922b73e6f8e76e06e43e3073fbc..91e0df3d2f7be8946a187d14e73de462ab62c07f 100644 (file)
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -137,6 +137,8 @@ basic_sources = files('''
         namespace-util.c
         namespace-util.h
         nss-util.h
+        nulstr-util.c
+        nulstr-util.h
         ordered-set.c
         ordered-set.h
         parse-util.c

diff --git a/src/basic/nulstr-util.c b/src/basic/nulstr-util.c
new file mode 100644 (file)
index 0000000..b12d020
--- /dev/null
+++ b/src/basic/nulstr-util.c
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#include "nulstr-util.h"
+#include "string-util.h"
+
+bool nulstr_contains(const char *nulstr, const char *needle) {
+        const char *i;
+
+        if (!nulstr)
+                return false;
+
+        NULSTR_FOREACH(i, nulstr)
+                if (streq(i, needle))
+                        return true;
+
+        return false;
+}

diff --git a/src/basic/nulstr-util.h b/src/basic/nulstr-util.h
new file mode 100644 (file)
index 0000000..436b271
--- /dev/null
+++ b/src/basic/nulstr-util.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+#pragma once
+
+#include <stdbool.h>
+#include <string.h>
+
+#define NULSTR_FOREACH(i, l)                                    \
+        for ((i) = (l); (i) && *(i); (i) = strchr((i), 0)+1)
+
+#define NULSTR_FOREACH_PAIR(i, j, l)                             \
+        for ((i) = (l), (j) = strchr((i), 0)+1; (i) && *(i); (i) = strchr((j), 0)+1, (j) = *(i) ? strchr((i), 0)+1 : (i))
+
+bool nulstr_contains(const char *nulstr, const char *needle);

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 1fa813b747dc7bfc9031426102b7bfda869d33f5..55cb140d873508f2a330083ec3e2feef183b0605 100644 (file)
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -21,6 +21,7 @@
 #include "log.h"
 #include "macro.h"
 #include "missing.h"
+#include "nulstr-util.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "stat-util.h"

diff --git a/src/basic/string-util.c b/src/basic/string-util.c
index 49c2679e988f3df10d58b1a8596fc3e71d2644e3..5001a2be3a1f1e794e162956f6ccc2627151f306 100644 (file)
--- a/src/basic/string-util.c
+++ b/src/basic/string-util.c
@@ -676,19 +676,6 @@ char *cellescape(char *buf, size_t len, const char *s) {
         return buf;
 }
 
-bool nulstr_contains(const char *nulstr, const char *needle) {
-        const char *i;
-
-        if (!nulstr)
-                return false;
-
-        NULSTR_FOREACH(i, nulstr)
-                if (streq(i, needle))
-                        return true;
-
-        return false;
-}
-
 char* strshorten(char *s, size_t l) {
         assert(s);
 

diff --git a/src/basic/string-util.h b/src/basic/string-util.h
index b5328e0e8ad2b1c4082808017264e9cf8ef287d0..b0909dddca9b6a0e1dbf8e15a1eba292b2595f19 100644 (file)
--- a/src/basic/string-util.h
+++ b/src/basic/string-util.h
@@ -165,8 +165,6 @@ char *cellescape(char *buf, size_t len, const char *s);
 /* This limit is arbitrary, enough to give some idea what the string contains */
 #define CELLESCAPE_DEFAULT_LENGTH 64
 
-bool nulstr_contains(const char *nulstr, const char *needle);
-
 char* strshorten(char *s, size_t l);
 
 char *strreplace(const char *text, const char *old_string, const char *new_string);

diff --git a/src/basic/strv.c b/src/basic/strv.c
index 3700ce5b30b524145a8c0de9aee48f689a9b1f65..21c106149b219910cf5b2dd07b20aecdcc0d9e96 100644 (file)
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -11,6 +11,7 @@
 #include "escape.h"
 #include "extract-word.h"
 #include "fileio.h"
+#include "nulstr-util.h"
 #include "sort-util.h"
 #include "string-util.h"
 #include "strv.h"

diff --git a/src/basic/util.h b/src/basic/util.h
index 469f3eee4d7a27981a0fa1de9e605e9658e5f016..0d40db059abdb9ddd23f0d0f3290ffe90049c8c3 100644 (file)
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -43,12 +43,6 @@ static inline const char* enable_disable(bool b) {
         return b ? "enable" : "disable";
 }
 
-#define NULSTR_FOREACH(i, l)                                    \
-        for ((i) = (l); (i) && *(i); (i) = strchr((i), 0)+1)
-
-#define NULSTR_FOREACH_PAIR(i, j, l)                             \
-        for ((i) = (l), (j) = strchr((i), 0)+1; (i) && *(i); (i) = strchr((j), 0)+1, (j) = *(i) ? strchr((i), 0)+1 : (i))
-
 extern int saved_argc;
 extern char **saved_argv;
 

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index ccf06173db5a5d3dbfc9a9c061f0bd791ccb2770..059bf29eb9c8670e4fcf0f28c5d2c6957445e167 100644 (file)
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -5,15 +5,16 @@
 
 #include "alloc-util.h"
 #include "blockdev-util.h"
+#include "bpf-devices.h"
 #include "bpf-firewall.h"
 #include "btrfs-util.h"
-#include "bpf-devices.h"
 #include "bus-error.h"
 #include "cgroup-util.h"
 #include "cgroup.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
+#include "nulstr-util.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 805bdbca9b706e9b9aebb02f6e0c48ecaad3dd09..2f62c7acb538081f4d0edfd00bb41cba957a3dac 100644 (file)
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -41,6 +41,7 @@
 #include "log.h"
 #include "missing.h"
 #include "mountpoint-util.h"
+#include "nulstr-util.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"

diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index 3ce6164b06fd0f06bd467ac62a49016ab006a19a..b97285e556c3d3867399791059c74ab0a8715328 100644 (file)
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -23,12 +23,12 @@
 #include "mkdir.h"
 #include "mount-setup.h"
 #include "mountpoint-util.h"
+#include "nulstr-util.h"
 #include "path-util.h"
 #include "set.h"
 #include "smack-util.h"
 #include "strv.h"
 #include "user-util.h"
-#include "util.h"
 #include "virt.h"
 
 typedef enum MountMode {

diff --git a/src/core/namespace.c b/src/core/namespace.c
index 582f6cb249582684cb4d65b69fe90426a7f78856..e6013c757ec362097ac534bb807c899b60530238 100644 (file)
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -23,6 +23,7 @@
 #include "mountpoint-util.h"
 #include "namespace-util.h"
 #include "namespace.h"
+#include "nulstr-util.h"
 #include "path-util.h"
 #include "selinux-util.h"
 #include "socket-util.h"

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index a16ea1024bad9b2bf373f00add14d08e4fa6f57c..87e0cefbab5d9831f5b6e6fcc2e42f4aa928339b 100644 (file)
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -16,12 +16,12 @@
 #include "log.h"
 #include "main-func.h"
 #include "mount-util.h"
+#include "nulstr-util.h"
 #include "parse-util.h"
 #include "path-util.h"
+#include "pretty-print.h"
 #include "string-util.h"
 #include "strv.h"
-#include "pretty-print.h"
-#include "util.h"
 
 /* internal helper */
 #define ANY_LUKS "LUKS"

diff --git a/src/delta/delta.c b/src/delta/delta.c
index 1ffbc6c571dcf73d3612a435b80b8ed06bf9308a..c28a816d6774abee7090f40d1faab3f04ee2a6f7 100644 (file)
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -14,6 +14,7 @@
 #include "locale-util.h"
 #include "log.h"
 #include "main-func.h"
+#include "nulstr-util.h"
 #include "pager.h"
 #include "parse-util.h"
 #include "path-util.h"
@@ -24,7 +25,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
-#include "util.h"
 
 static const char prefixes[] =
         "/etc\0"

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 7777450c35401db8aaacc2950f814ba34ac886ea..058a71b109deb82afe4223f1842f14975b6a3b80 100644 (file)
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -19,6 +19,7 @@
 #include "main-func.h"
 #include "missing_capability.h"
 #include "nscd-flush.h"
+#include "nulstr-util.h"
 #include "os-util.h"
 #include "parse-util.h"
 #include "path-util.h"

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 9b813a14a0a5d6ddf2bbc20825817db80d9be80c..42a5a09608ffcccc00743c956e749430c7bf6196 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -52,6 +52,7 @@
 #include "logs-show.h"
 #include "memory-util.h"
 #include "mkdir.h"
+#include "nulstr-util.h"
 #include "pager.h"
 #include "parse-util.h"
 #include "path-util.h"

diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 0f996283cdf7a29a0ef7eb34abcec32a98ea54dc..82e7d59fbb28a7768840c45c53e0b6abd828db5d 100644 (file)
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -32,6 +32,7 @@
 #include "list.h"
 #include "lookup3.h"
 #include "missing.h"
+#include "nulstr-util.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "replace-var.h"

diff --git a/src/journal/test-compress-benchmark.c b/src/journal/test-compress-benchmark.c
index 1838f5b7d9e46bf86f7c335b0b1fa1db8ca8dcb9..100599705859a3560b54f831b4dce2a1a38a2fff 100644 (file)
--- a/src/journal/test-compress-benchmark.c
+++ b/src/journal/test-compress-benchmark.c
@@ -5,12 +5,12 @@
 #include "env-util.h"
 #include "macro.h"
 #include "memory-util.h"
+#include "nulstr-util.h"
 #include "parse-util.h"
 #include "process-util.h"
 #include "random-util.h"
 #include "string-util.h"
 #include "tests.h"
-#include "util.h"
 
 typedef int (compress_t)(const void *src, uint64_t src_size, void *dst,
                          size_t dst_alloc_size, size_t *dst_size);

diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c
index 6f17eeeee9c5237df05e44dfbbc77cdf62a88652..a0855001e308f1af59951d253fa7ae8e8407625b 100644 (file)
--- a/src/libsystemd/sd-device/device-private.c
+++ b/src/libsystemd/sd-device/device-private.c
@@ -16,6 +16,7 @@
 #include "hashmap.h"
 #include "macro.h"
 #include "mkdir.h"
+#include "nulstr-util.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "set.h"
@@ -25,7 +26,6 @@
 #include "strxcpyx.h"
 #include "tmpfile-util.h"
 #include "user-util.h"
-#include "util.h"
 
 int device_add_property(sd_device *device, const char *key, const char *value) {
         int r;

diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c
index d8c37c3fd4735fbb7ae7a95a6d30c19f58776c66..77531d9505cc85da9b40247f2d7f17c42ee7de57 100644 (file)
--- a/src/libsystemd/sd-hwdb/sd-hwdb.c
+++ b/src/libsystemd/sd-hwdb/sd-hwdb.c
@@ -18,8 +18,8 @@
 #include "hashmap.h"
 #include "hwdb-internal.h"
 #include "hwdb-util.h"
+#include "nulstr-util.h"
 #include "string-util.h"
-#include "util.h"
 
 struct sd_hwdb {
         unsigned n_ref;

diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c
index 64d18d916e46d42c174e549fb1ba0e0048c3e6f0..67f33612deee1549343d68bd50cc3df7d7b6ece3 100644 (file)
--- a/src/locale/keymap-util.c
+++ b/src/locale/keymap-util.c
@@ -17,6 +17,7 @@
 #include "locale-util.h"
 #include "macro.h"
 #include "mkdir.h"
+#include "nulstr-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "tmpfile-util.h"

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index b24698469dc42610787413659ec012006f12f99c..c8607bcec3eec43567fc089cb06eed2610bd5090 100644 (file)
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -37,6 +37,7 @@
 #include "macro.h"
 #include "main-func.h"
 #include "mkdir.h"
+#include "nulstr-util.h"
 #include "pager.h"
 #include "parse-util.h"
 #include "path-util.h"

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index c6cc82b12f4580314102ae99aecb4ec25f418a67..05203057b64749791877b0b2e0c64780f5eb92d6 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -74,6 +74,7 @@
 #include "nspawn-settings.h"
 #include "nspawn-setuid.h"
 #include "nspawn-stub-pid1.h"
+#include "nulstr-util.h"
 #include "os-util.h"
 #include "pager.h"
 #include "parse-util.h"

diff --git a/src/portable/portable.c b/src/portable/portable.c
index 9d0d21c11533a59dbc46648ec0f420927ffed9a3..44e6ca2d30ffc0f47ff106e430b00dfd2c57307c 100644 (file)
--- a/src/portable/portable.c
+++ b/src/portable/portable.c
@@ -17,6 +17,7 @@
 #include "loop-util.h"
 #include "machine-image.h"
 #include "mkdir.h"
+#include "nulstr-util.h"
 #include "os-util.h"
 #include "path-lookup.h"
 #include "portable.h"

diff --git a/src/resolve/resolved-dns-trust-anchor.c b/src/resolve/resolved-dns-trust-anchor.c
index e5a27ca68815b60920857f824950981e429ddbc2..d25b5f9d954d3d8007843f336eea898a15890ad9 100644 (file)
--- a/src/resolve/resolved-dns-trust-anchor.c
+++ b/src/resolve/resolved-dns-trust-anchor.c
@@ -9,6 +9,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "hexdecoct.h"
+#include "nulstr-util.h"
 #include "parse-util.h"
 #include "resolved-dns-dnssec.h"
 #include "resolved-dns-trust-anchor.h"

diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
index 89d7a7d59b685fe3488615818a9f879ced88222c..52460cacad2a6c82867249bbf709fc0bd6e3931a 100644 (file)
--- a/src/shared/base-filesystem.c
+++ b/src/shared/base-filesystem.c
@@ -13,10 +13,10 @@
 #include "fd-util.h"
 #include "log.h"
 #include "macro.h"
+#include "nulstr-util.h"
 #include "string-util.h"
 #include "umask-util.h"
 #include "user-util.h"
-#include "util.h"
 
 typedef struct BaseFilesystem {
         const char *dir;

diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index aa8283313f7576ebdf128163b639a884515615f0..2df09edaf57cb733dec20e0000cce20c88429435 100644 (file)
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -19,6 +19,7 @@
 #include "log.h"
 #include "macro.h"
 #include "missing.h"
+#include "nulstr-util.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"

diff --git a/src/shared/dev-setup.c b/src/shared/dev-setup.c
index b545c2a1c0e16d511b0075db27ce573c5f86f038..12e80e4b98f128cba183eea36edc687778990a57 100644 (file)
--- a/src/shared/dev-setup.c
+++ b/src/shared/dev-setup.c
@@ -8,10 +8,10 @@
 #include "dev-setup.h"
 #include "label.h"
 #include "log.h"
+#include "nulstr-util.h"
 #include "path-util.h"
 #include "umask-util.h"
 #include "user-util.h"
-#include "util.h"
 
 int dev_setup(const char *prefix, uid_t uid, gid_t gid) {
         static const char symlinks[] =

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 201a515589923662e7e8b3803b013628d6f05744..ce210bfd4360a65cc1a59a96030ae57c117ca58a 100644 (file)
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -29,6 +29,7 @@
 #include "missing.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"
+#include "nulstr-util.h"
 #include "os-util.h"
 #include "path-util.h"
 #include "process-util.h"

diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index 6fd9866c0098667c1b7d026b0148ed95d244e997..118d591c09b51f878857314e19c8efea7d6c836e 100644 (file)
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -11,11 +11,11 @@
 #include "fstab-util.h"
 #include "macro.h"
 #include "mount-util.h"
+#include "nulstr-util.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 
 int fstab_has_fstype(const char *fstype) {
         _cleanup_endmntent_ FILE *f = NULL;

diff --git a/src/shared/import-util.c b/src/shared/import-util.c
index bcd6c0c5ea17554865dfb9c6b2fd4f7527ca4edc..dad6c1c2fe733804c0acdc191def9a034ba6c165 100644 (file)
--- a/src/shared/import-util.c
+++ b/src/shared/import-util.c
@@ -8,10 +8,10 @@
 #include "import-util.h"
 #include "log.h"
 #include "macro.h"
+#include "nulstr-util.h"
 #include "path-util.h"
 #include "string-table.h"
 #include "string-util.h"
-#include "util.h"
 
 int import_url_last_component(const char *url, char **ret) {
         const char *e, *p;

diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
index 3d61221056aaa907948c0dcffa5d8135c993149e..c5a6f2d4eeae96a54d3eb0137c4fff9d31b77eb6 100644 (file)
--- a/src/shared/machine-image.c
+++ b/src/shared/machine-image.c
@@ -31,6 +31,7 @@
 #include "machine-image.h"
 #include "macro.h"
 #include "mkdir.h"
+#include "nulstr-util.h"
 #include "os-util.h"
 #include "path-util.h"
 #include "rm-rf.h"
@@ -39,7 +40,6 @@
 #include "strv.h"
 #include "time-util.h"
 #include "utf8.h"
-#include "util.h"
 #include "xattr-util.h"
 
 static const char* const image_search_path[_IMAGE_CLASS_MAX] = {

diff --git a/src/shared/seccomp-util.c b/src/shared/seccomp-util.c
index 98a0066baec60b335754acaa2a2661e5779695a0..54f9679e16da427e857dbad2e8c5919cf93171e5 100644 (file)
--- a/src/shared/seccomp-util.c
+++ b/src/shared/seccomp-util.c
@@ -10,15 +10,15 @@
 
 #include "af-list.h"
 #include "alloc-util.h"
+#include "errno-list.h"
 #include "macro.h"
 #include "nsflags.h"
+#include "nulstr-util.h"
 #include "process-util.h"
 #include "seccomp-util.h"
 #include "set.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
-#include "errno-list.h"
 
 const uint32_t seccomp_local_archs[] = {
 

diff --git a/src/test/test-condition.c b/src/test/test-condition.c
index 5c2d00af886a5ca7ff3035e55e382f3fb1c24f44..875d0d56c5dec66013d62cfa22e71719c91791c0 100644 (file)
--- a/src/test/test-condition.c
+++ b/src/test/test-condition.c
@@ -19,15 +19,15 @@
 #include "ima-util.h"
 #include "log.h"
 #include "macro.h"
+#include "nulstr-util.h"
 #include "selinux-util.h"
 #include "set.h"
 #include "smack-util.h"
 #include "string-util.h"
 #include "strv.h"
+#include "tests.h"
 #include "tomoyo-util.h"
 #include "user-util.h"
-#include "tests.h"
-#include "util.h"
 #include "virt.h"
 
 static void test_condition_test_path(void) {

diff --git a/src/test/test-hashmap-plain.c b/src/test/test-hashmap-plain.c
index 5376aa84c40a5c69353e9b78cf1bcd8e9dc02c8f..325c3b32ccdf047d3fac2b70b8cdc47948e45b77 100644 (file)
--- a/src/test/test-hashmap-plain.c
+++ b/src/test/test-hashmap-plain.c
@@ -3,11 +3,11 @@
 #include "alloc-util.h"
 #include "hashmap.h"
 #include "log.h"
+#include "nulstr-util.h"
 #include "stdio-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "tests.h"
-#include "util.h"
 
 void test_hashmap_funcs(void);
 

diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c
index 65f1aae5a756eead2b349f0b1c84ae44f7d62410..d79481853a2dd6357dd11c42c038e56ca40e7e82 100644 (file)
--- a/src/test/test-seccomp.c
+++ b/src/test/test-seccomp.c
@@ -16,6 +16,7 @@
 #include "memory-util.h"
 #include "missing.h"
 #include "nsflags.h"
+#include "nulstr-util.h"
 #include "process-util.h"
 #include "raw-clone.h"
 #include "seccomp-util.h"

diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index 31ef1abb4441c7f88c8054d44e957c0fa1f42e6e..18ad03669cd5e5b117301695f2e22c012922b4f8 100644 (file)
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -4,10 +4,10 @@
 
 #include "alloc-util.h"
 #include "escape.h"
+#include "nulstr-util.h"
 #include "specifier.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 
 static void test_specifier_printf(void) {
         static const Specifier table[] = {