basic: rename util.h to logarithm.h

util.h is now about logarithms only, so we can rename it. Many files included
util.h for no apparent reason… Those includes are dropped.

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index b6474d31a72378d85a989ee39c7bc3f47e09f89c..e66477f3288b05438219dfd13be6127c51b62e0d 100644 (file)
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -19,7 +19,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
-#include "util.h"
 
 #define PCI_CLASS_GRAPHICS_CARD 0x30000
 

diff --git a/src/basic/architecture.h b/src/basic/architecture.h
index b86f5f35d0f777b96f8209913a3a8d444dab27c9..096526a8570e224592eabe42f0c6ebb30f15776f 100644 (file)
--- a/src/basic/architecture.h
+++ b/src/basic/architecture.h
@@ -4,7 +4,6 @@
 #include <endian.h>
 
 #include "macro.h"
-#include "util.h"
 
 /* A cleaned up architecture definition. We don't want to get lost in
  * processor features, models, generations or even ABIs. Hence we

diff --git a/src/basic/async.c b/src/basic/async.c
index 443cfa95ab70abe80c4b7bb51cab000bb9c21b1a..241803f33a6a6c8effc4b0bff49bcce8e70f1b73 100644 (file)
--- a/src/basic/async.c
+++ b/src/basic/async.c
@@ -12,7 +12,6 @@
 #include "macro.h"
 #include "process-util.h"
 #include "signal-util.h"
-#include "util.h"
 
 int asynchronous_job(void* (*func)(void *p), void *arg) {
         sigset_t ss, saved_ss;

diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c
index fdc7948a23f70f74c2901e959884b28ff93879dc..fb1ad14fd3b50eb91c66bcbd82022f344290d523 100644 (file)
--- a/src/basic/cap-list.c
+++ b/src/basic/cap-list.c
@@ -10,7 +10,6 @@
 #include "macro.h"
 #include "parse-util.h"
 #include "stdio-util.h"
-#include "util.h"
 
 static const struct capability_name* lookup_capability(register const char *str, register GPERF_LEN_TYPE len);
 

diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c
index fa74b5b9c631ef4a500c0a82b3f7d92b072b59e9..5ab110d341786131560a3be5e4e029fdaea1445a 100644 (file)
--- a/src/basic/capability-util.c
+++ b/src/basic/capability-util.c
@@ -11,11 +11,11 @@
 #include "cap-list.h"
 #include "fileio.h"
 #include "log.h"
+#include "logarithm.h"
 #include "macro.h"
 #include "missing_prctl.h"
 #include "parse-util.h"
 #include "user-util.h"
-#include "util.h"
 
 int have_effective_cap(int value) {
         _cleanup_cap_free_ cap_t cap = NULL;

diff --git a/src/basic/capability-util.h b/src/basic/capability-util.h
index dbce54531d1e2c120960a2d8a0edebcb2c96c8af..4d1b0521f405365d97aac02801c1322bfdcc9022 100644 (file)
--- a/src/basic/capability-util.h
+++ b/src/basic/capability-util.h
@@ -8,7 +8,6 @@
 
 #include "macro.h"
 #include "missing_capability.h"
-#include "util.h"
 
 #define CAP_ALL UINT64_MAX
 

diff --git a/src/basic/compress.c b/src/basic/compress.c
index 1e94635397c7cf2d87794b1d0b342502a3ca5c9f..0a330ecb55137d1e92b855f3066443ebe45dc0de 100644 (file)
--- a/src/basic/compress.c
+++ b/src/basic/compress.c
@@ -32,7 +32,6 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "unaligned.h"
-#include "util.h"
 
 #if HAVE_LZ4
 DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(LZ4F_compressionContext_t, LZ4F_freeCompressionContext, NULL);

diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index 66bb7569bbb39831666ab65eff2be4629472832c..ec33a61588e9f8cb6eca7236c38e5a88fe4bdb89 100644 (file)
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -29,7 +29,6 @@
 #include "stat-util.h"
 #include "stdio-util.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 /* The maximum number of iterations in the loop to close descriptors in the fallback case
  * when /proc/self/fd/ is inaccessible. */

diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index 6b757bd5705b182343ec357e18a4ed42feb090fe..8b4d81ebdc02f6ed505f204276d28cf00fa6ea51 100644 (file)
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -32,7 +32,6 @@
 #include "tmpfile-util.h"
 #include "umask-util.h"
 #include "user-util.h"
-#include "util.h"
 
 int unlink_noerrno(const char *path) {
         PROTECT_ERRNO;

diff --git a/src/basic/hashmap.c b/src/basic/hashmap.c
index f68cd36bb72f4dd85023469b66c004913f79a905..d19627595f07aedc8319282b62998b43ceb5ed41 100644 (file)
--- a/src/basic/hashmap.c
+++ b/src/basic/hashmap.c
@@ -9,6 +9,7 @@
 #include "alloc-util.h"
 #include "fileio.h"
 #include "hashmap.h"
+#include "logarithm.h"
 #include "macro.h"
 #include "memory-util.h"
 #include "mempool.h"

diff --git a/src/basic/hashmap.h b/src/basic/hashmap.h
index 91b3fe862b02325808edf615fe77a6689a054095..ebb5a63eb447765254ab9f4c761f834b7b4cc7e1 100644 (file)
--- a/src/basic/hashmap.h
+++ b/src/basic/hashmap.h
@@ -7,7 +7,6 @@
 
 #include "hash-funcs.h"
 #include "macro.h"
-#include "util.h"
 
 /*
  * A hash table implementation. As a minor optimization a NULL hashmap object

diff --git a/src/basic/in-addr-util.c b/src/basic/in-addr-util.c
index 05c729d34da804c2afe657ecd3183925113f3e68..8ee5c0cc209330ecbaed426c273f28b0aa04e560 100644 (file)
--- a/src/basic/in-addr-util.c
+++ b/src/basic/in-addr-util.c
@@ -11,13 +11,13 @@
 #include "alloc-util.h"
 #include "errno-util.h"
 #include "in-addr-util.h"
+#include "logarithm.h"
 #include "macro.h"
 #include "parse-util.h"
 #include "random-util.h"
 #include "stdio-util.h"
 #include "string-util.h"
 #include "strxcpyx.h"
-#include "util.h"
 
 bool in4_addr_is_null(const struct in_addr *a) {
         assert(a);

diff --git a/src/basic/in-addr-util.h b/src/basic/in-addr-util.h
index 19fa35f1d28b8308e639aacfb181f3f8d0c805f5..8d6efaa006253eb2beaa4b5b8d050eb803de652d 100644 (file)
--- a/src/basic/in-addr-util.h
+++ b/src/basic/in-addr-util.h
@@ -8,7 +8,6 @@
 
 #include "hash-funcs.h"
 #include "macro.h"
-#include "util.h"
 
 union in_addr_union {
         struct in_addr in;

diff --git a/src/basic/util.h b/src/basic/logarithm.h
similarity index 100%
rename from src/basic/util.h
rename to src/basic/logarithm.h

diff --git a/src/basic/meson.build b/src/basic/meson.build
index c5dd116964d255f5f741841951bba2ca15da390e..a4d7cb5fb30e5dbb3d6d0567cff4bf4ac290092e 100644 (file)
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -130,6 +130,7 @@ basic_sources = files(
         'locale-util.h',
         'log.c',
         'log.h',
+        'logarithm.h',
         'login-util.c',
         'login-util.h',
         'macro.h',
@@ -258,7 +259,6 @@ basic_sources = files(
         'user-util.h',
         'utf8.c',
         'utf8.h',
-        'util.h',
         'virt.c',
         'virt.h',
         'xattr-util.c',

diff --git a/src/basic/string-util.c b/src/basic/string-util.c
index 17d35fe1a4579cd9e098dcab537a4a565af4844b..5e3a92c7c0c9d6c2cd568816c9daf47f6aa24162 100644 (file)
--- a/src/basic/string-util.c
+++ b/src/basic/string-util.c
@@ -18,7 +18,6 @@
 #include "strv.h"
 #include "terminal-util.h"
 #include "utf8.h"
-#include "util.h"
 
 char* first_word(const char *s, const char *word) {
         size_t sl, wl;

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 0c092597eb8deae7f97c8d73de45e5879688af11..77f13c7bea0121cb2d20bb335a10ea2cb3c8d30a 100644 (file)
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -44,7 +44,6 @@
 #include "terminal-util.h"
 #include "time-util.h"
 #include "user-util.h"
-#include "util.h"
 
 static volatile unsigned cached_columns = 0;
 static volatile unsigned cached_lines = 0;

diff --git a/src/busctl/busctl-introspect.c b/src/busctl/busctl-introspect.c
index 6002af5b2a96ac118fca21f828b5c96aaea65b29..a248205f3f30cceb559dd7a17aecd20821073710 100644 (file)
--- a/src/busctl/busctl-introspect.c
+++ b/src/busctl/busctl-introspect.c
@@ -6,7 +6,6 @@
 #include "busctl-introspect.h"
 #include "path-util.h"
 #include "string-util.h"
-#include "util.h"
 #include "xml.h"
 
 #define NODE_DEPTH_MAX 16

diff --git a/src/core/audit-fd.c b/src/core/audit-fd.c
index 097bea39b3eb85fede6ff2a52c5cc4dc0f7825da..872280f7981614dc87e5846ab981df29785fc7cb 100644 (file)
--- a/src/core/audit-fd.c
+++ b/src/core/audit-fd.c
@@ -12,7 +12,6 @@
 #include "capability-util.h"
 #include "fd-util.h"
 #include "log.h"
-#include "util.h"
 
 static bool initialized = false;
 static int audit_fd;

diff --git a/src/core/kill.c b/src/core/kill.c
index e858ae9607e2372a37573d9579336e986e6d4a99..c8b581d05d5e75aa9130a799ce04cb6d9e47d9b6 100644 (file)
--- a/src/core/kill.c
+++ b/src/core/kill.c
@@ -3,7 +3,6 @@
 #include "kill.h"
 #include "signal-util.h"
 #include "string-table.h"
-#include "util.h"
 
 void kill_context_init(KillContext *c) {
         assert(c);

diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
index c1744cff92da4369e43abeeb9f327900f5cd4cf7..e05ebdc631d533536160b3ac6af0bb8fd57cb1dd 100644 (file)
--- a/src/core/selinux-access.c
+++ b/src/core/selinux-access.c
@@ -23,7 +23,6 @@
 #include "selinux-util.h"
 #include "stdio-util.h"
 #include "strv.h"
-#include "util.h"
 
 static bool initialized = false;
 

diff --git a/src/core/service.c b/src/core/service.c
index 42de40e1375c251d7592ec58ed2c10cc6702c34b..bd44c379534005ff664d9607fc2a11df23727e59 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -41,7 +41,6 @@
 #include "unit-name.h"
 #include "unit.h"
 #include "utf8.h"
-#include "util.h"
 
 #define service_spawn(...) service_spawn_internal(__func__, __VA_ARGS__)
 

diff --git a/src/core/show-status.c b/src/core/show-status.c
index df2542993894af6baaca34bd6b120e9f90726224..2ba7a8588d2a182f766524fec7e2f690a4497aab 100644 (file)
--- a/src/core/show-status.c
+++ b/src/core/show-status.c
@@ -12,7 +12,6 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "terminal-util.h"
-#include "util.h"
 
 static const char* const show_status_table[_SHOW_STATUS_MAX] = {
         [SHOW_STATUS_NO]        = "no",

diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c
index b76bb744650908cb930851a955589164f18658ee..58552f79e73e48b8b4abff73fa8fe6e96f2d0ac2 100644 (file)
--- a/src/core/smack-setup.c
+++ b/src/core/smack-setup.c
@@ -19,7 +19,6 @@
 #include "macro.h"
 #include "smack-setup.h"
 #include "string-util.h"
-#include "util.h"
 
 #if ENABLE_SMACK
 

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 07903f1044e7cb0524368c570ba639fa7f1f2c34..083878e42a318f9e1125eec3368ffeff858de340 100644 (file)
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -23,7 +23,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "unit-name.h"
-#include "util.h"
 
 typedef struct crypto_device {
         char *uuid;

diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 595434ab571e327ebf5c5e7aacc8a3ac5a1ff2bb..73c76fceea5b8c1143696e496f0dd6a4ddf1f513 100644 (file)
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -32,7 +32,6 @@
 #include "socket-util.h"
 #include "special.h"
 #include "stdio-util.h"
-#include "util.h"
 
 static bool arg_skip = false;
 static bool arg_force = false;

diff --git a/src/fuzz/fuzz-time-util.c b/src/fuzz/fuzz-time-util.c
index bf2a66336cadf05cbbed0512bc3ed683c8264936..f1c95ae09b8306a4989a070e6be9f5e5b0466098 100644 (file)
--- a/src/fuzz/fuzz-time-util.c
+++ b/src/fuzz/fuzz-time-util.c
@@ -4,7 +4,6 @@
 #include "fd-util.h"
 #include "fuzz.h"
 #include "time-util.h"
-#include "util.h"
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         _cleanup_free_ char *str = NULL;

diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c
index 4e8162a319871444c109e27ac993d8b55072effc..b3f5ddc5860e012feeb6fed85852b010124cc566 100644 (file)
--- a/src/getty-generator/getty-generator.c
+++ b/src/getty-generator/getty-generator.c
@@ -18,7 +18,6 @@
 #include "strv.h"
 #include "terminal-util.h"
 #include "unit-name.h"
-#include "util.h"
 #include "virt.h"
 
 static const char *arg_dest = NULL;

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 486b093062fcc94aa551071522e2201075a49ab1..ee3ef047400b87f3b5c4bc14bfa8201c2354fb9e 100644 (file)
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -36,7 +36,6 @@
 #include "string-table.h"
 #include "strv.h"
 #include "user-util.h"
-#include "util.h"
 #include "virt.h"
 
 #define VALID_DEPLOYMENT_CHARS (DIGITS LETTERS "-.:")

diff --git a/src/import/export-raw.c b/src/import/export-raw.c
index a3ff6a393410ef40b07ed79dba86df425d19d704..6b15884e777dd071d8963e046382b1c03aae979e 100644 (file)
--- a/src/import/export-raw.c
+++ b/src/import/export-raw.c
@@ -16,7 +16,6 @@
 #include "stat-util.h"
 #include "string-util.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 #define COPY_BUFFER_SIZE (16*1024)
 

diff --git a/src/import/export-tar.c b/src/import/export-tar.c
index 78f0a7ca75266cdc6c3fdbc46ee4c8d152746846..b9953a4bf3743e72e8b5f8233e270813e01b0172 100644 (file)
--- a/src/import/export-tar.c
+++ b/src/import/export-tar.c
@@ -11,7 +11,6 @@
 #include "ratelimit.h"
 #include "string-util.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 #define COPY_BUFFER_SIZE (16*1024)
 

diff --git a/src/import/import-common.c b/src/import/import-common.c
index 4eda9087c5a88bc7ad2a121504be856d876d14e8..3c46aedf61896f30d1f11f9913cd3ce3c97da5b2 100644 (file)
--- a/src/import/import-common.c
+++ b/src/import/import-common.c
@@ -21,7 +21,6 @@
 #include "signal-util.h"
 #include "stat-util.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 int import_fork_tar_x(const char *path, pid_t *ret) {
         _cleanup_close_pair_ int pipefd[2] = { -1, -1 };

diff --git a/src/import/import-compress.c b/src/import/import-compress.c
index 03f5efa00ec6ee4e789806de547d03f4572303e0..28cf6f841a2b39e71c95d941eafcce557e158794 100644 (file)
--- a/src/import/import-compress.c
+++ b/src/import/import-compress.c
@@ -2,7 +2,6 @@
 
 #include "import-compress.h"
 #include "string-table.h"
-#include "util.h"
 
 void import_compress_free(ImportCompress *c) {
         assert(c);

diff --git a/src/import/import-raw.c b/src/import/import-raw.c
index 30f5b9050ba5803eb24b30a490d0747c0049a714..ee904bc4e0ed6ee97f972041ddf5d1e5f20ace83 100644 (file)
--- a/src/import/import-raw.c
+++ b/src/import/import-raw.c
@@ -25,7 +25,6 @@
 #include "rm-rf.h"
 #include "string-util.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 struct RawImport {
         sd_event *event;

diff --git a/src/import/import-tar.c b/src/import/import-tar.c
index f31d3d75a1fc9dfb6d16e0beef4d24f5e5f88321..90b4e51d2c121a57a54ef4b15864fe5b65536185 100644 (file)
--- a/src/import/import-tar.c
+++ b/src/import/import-tar.c
@@ -26,7 +26,6 @@
 #include "rm-rf.h"
 #include "string-util.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 struct TarImport {
         sd_event *event;

diff --git a/src/import/importd.c b/src/import/importd.c
index 74e8ffb0cf328d978a65f06b2fad8c2f0045b2af..a6efb5315d3e251c011a141d8ba0b0ee7060ee27 100644 (file)
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -32,7 +32,6 @@
 #include "strv.h"
 #include "syslog-util.h"
 #include "user-util.h"
-#include "util.h"
 #include "web-util.h"
 
 typedef struct Transfer Transfer;

diff --git a/src/import/pull-common.c b/src/import/pull-common.c
index 028bae82a86a99c27e44b28cfa15f41320deea10..7633d3e74b3c170cf7dbca6244263fd7ad115cc4 100644 (file)
--- a/src/import/pull-common.c
+++ b/src/import/pull-common.c
@@ -22,7 +22,6 @@
 #include "siphash24.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 #include "web-util.h"
 
 #define FILENAME_ESCAPE "/.#\"\'"

diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c
index f4f869d38e926f8af49d97744354dd6ee8ba8770..d3d14af6d1d24ff01815da7f264b3b9692926a83 100644 (file)
--- a/src/import/pull-raw.c
+++ b/src/import/pull-raw.c
@@ -28,7 +28,6 @@
 #include "strv.h"
 #include "tmpfile-util.h"
 #include "utf8.h"
-#include "util.h"
 #include "web-util.h"
 
 typedef enum RawProgress {

diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c
index fd866fc514ed1b441fb9464c85b74219f2cce873..cf18461db30e070c8b58122eae5c8a0c6337705f 100644 (file)
--- a/src/import/pull-tar.c
+++ b/src/import/pull-tar.c
@@ -28,7 +28,6 @@
 #include "tmpfile-util.h"
 #include "user-util.h"
 #include "utf8.h"
-#include "util.h"
 #include "web-util.h"
 
 typedef enum TarProgress {

diff --git a/src/import/qcow2-util.c b/src/import/qcow2-util.c
index 5a7232d3edcbb1e5596167583e48069b546a1594..fe2b5350875ca10ec611ce6b9417db0fe678d529 100644 (file)
--- a/src/import/qcow2-util.c
+++ b/src/import/qcow2-util.c
@@ -6,7 +6,6 @@
 #include "btrfs-util.h"
 #include "qcow2-util.h"
 #include "sparse-endian.h"
-#include "util.h"
 
 #define QCOW2_MAGIC 0x514649fb
 

diff --git a/src/journal-remote/journal-upload-journal.c b/src/journal-remote/journal-upload-journal.c
index 7a8f50dd0df0578018173205c9074ca3870f1f82..8206ca89bf2ead1a480d5935e66f58cf187ec2a3 100644 (file)
--- a/src/journal-remote/journal-upload-journal.c
+++ b/src/journal-remote/journal-upload-journal.c
@@ -10,7 +10,6 @@
 #include "log.h"
 #include "string-util.h"
 #include "utf8.h"
-#include "util.h"
 
 /**
  * Write up to size bytes to buf. Return negative on error, and number of

diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c
index 271e304273b1a3ef9538d309eb8ac5e613d0f0cd..9e6c36f87d1de6c48068e39675b5248411e9a2b8 100644 (file)
--- a/src/journal-remote/microhttpd-util.c
+++ b/src/journal-remote/microhttpd-util.c
@@ -14,7 +14,6 @@
 #include "microhttpd-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 
 void microhttpd_logger(void *arg, const char *fmt, va_list ap) {
         char *f;

diff --git a/src/journal/journald-rate-limit.c b/src/journal/journald-rate-limit.c
index 842882bc59699ec5fad78bf3cd8b98f9e01146a8..65fbe400a8f866702a9b55c05fa3bcc0bdda6a96 100644 (file)
--- a/src/journal/journald-rate-limit.c
+++ b/src/journal/journald-rate-limit.c
@@ -6,6 +6,7 @@
 #include "hashmap.h"
 #include "journald-rate-limit.h"
 #include "list.h"
+#include "logarithm.h"
 #include "random-util.h"
 #include "string-util.h"
 #include "time-util.h"

diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c
index 378bf162ca92086b07fbc757df37a31f25687b1c..c5288000af81c9ae0d90c6e55cf6e137f5bc1758 100644 (file)
--- a/src/journal/test-journal-interleaving.c
+++ b/src/journal/test-journal-interleaving.c
@@ -14,7 +14,6 @@
 #include "parse-util.h"
 #include "rm-rf.h"
 #include "tests.h"
-#include "util.h"
 
 /* This program tests skipping around in a multi-file journal. */
 

diff --git a/src/journal/test-journal-stream.c b/src/journal/test-journal-stream.c
index ac5b7f00054f2c3bce90941e81dc5e683a757064..9f4494c6c0ab05ba4bf4485675ba3c0cdd20aa07 100644 (file)
--- a/src/journal/test-journal-stream.c
+++ b/src/journal/test-journal-stream.c
@@ -15,7 +15,6 @@
 #include "parse-util.h"
 #include "rm-rf.h"
 #include "tests.h"
-#include "util.h"
 
 #define N_ENTRIES 200
 

diff --git a/src/journal/test-journal-verify.c b/src/journal/test-journal-verify.c
index e36ea8cae1184b88ddcbd06099322711a6a6714e..0c58d05ced3e5d373e8f174084549ba89d156df0 100644 (file)
--- a/src/journal/test-journal-verify.c
+++ b/src/journal/test-journal-verify.c
@@ -14,7 +14,6 @@
 #include "rm-rf.h"
 #include "terminal-util.h"
 #include "tests.h"
-#include "util.h"
 
 #define N_ENTRIES 6000
 #define RANDOM_RANGE 77

diff --git a/src/libsystemd-network/arp-util.c b/src/libsystemd-network/arp-util.c
index 99a5f69b7029740dac94bbde43274823454fb8a1..eec794a653b47eaf85afb0eba4f7d65a46f06160 100644 (file)
--- a/src/libsystemd-network/arp-util.c
+++ b/src/libsystemd-network/arp-util.c
@@ -12,7 +12,6 @@
 #include "fd-util.h"
 #include "in-addr-util.h"
 #include "unaligned.h"
-#include "util.h"
 
 int arp_update_filter(int fd, const struct in_addr *a, const struct ether_addr *mac) {
         struct sock_filter filter[] = {

diff --git a/src/libsystemd-network/dhcp-lease-internal.h b/src/libsystemd-network/dhcp-lease-internal.h
index c67e9511a134e4fc8c1a619512a1bde0c460ce4f..a660e522018736488c9f6f239d5b864d338260fc 100644 (file)
--- a/src/libsystemd-network/dhcp-lease-internal.h
+++ b/src/libsystemd-network/dhcp-lease-internal.h
@@ -10,7 +10,6 @@
 #include "dhcp-internal.h"
 #include "dhcp-protocol.h"
 #include "list.h"
-#include "util.h"
 
 struct sd_dhcp_route {
         struct in_addr dst_addr;

diff --git a/src/libsystemd-network/sd-ipv4ll.c b/src/libsystemd-network/sd-ipv4ll.c
index 4b0fac3cf1a281077a9a38c500ac42534ee80896..a29279e6afc5210337ce19bfa9323e13ddceb890 100644 (file)
--- a/src/libsystemd-network/sd-ipv4ll.c
+++ b/src/libsystemd-network/sd-ipv4ll.c
@@ -20,7 +20,6 @@
 #include "siphash24.h"
 #include "sparse-endian.h"
 #include "string-util.h"
-#include "util.h"
 
 #define IPV4LL_NETWORK UINT32_C(0xA9FE0000)
 #define IPV4LL_NETMASK UINT32_C(0xFFFF0000)

diff --git a/src/libsystemd-network/test-acd.c b/src/libsystemd-network/test-acd.c
index 73105f5a04104fa84ac5613ee7c0ec9fdf629881..4b5ad70cf15302d7f54f17d0bc116d429779362b 100644 (file)
--- a/src/libsystemd-network/test-acd.c
+++ b/src/libsystemd-network/test-acd.c
@@ -13,7 +13,6 @@
 
 #include "in-addr-util.h"
 #include "tests.h"
-#include "util.h"
 
 static void acd_handler(sd_ipv4acd *acd, int event, void *userdata) {
         assert_se(acd);

diff --git a/src/libsystemd-network/test-dhcp-client.c b/src/libsystemd-network/test-dhcp-client.c
index 0f3a68e99073e4d36c2cd5eaa23d12cebc407d5f..92b9b5b9bc558dbd0370294d13b66fea534cac0c 100644 (file)
--- a/src/libsystemd-network/test-dhcp-client.c
+++ b/src/libsystemd-network/test-dhcp-client.c
@@ -21,7 +21,6 @@
 #include "fd-util.h"
 #include "random-util.h"
 #include "tests.h"
-#include "util.h"
 
 static struct hw_addr_data hw_addr = {
         .length = ETH_ALEN,

diff --git a/src/libsystemd-network/test-ipv4ll-manual.c b/src/libsystemd-network/test-ipv4ll-manual.c
index 5453ef93a4a30fb50fe509a1070d7697d537568e..5dc6b1034761d52f4bb0ee40238baf344e8b2eca 100644 (file)
--- a/src/libsystemd-network/test-ipv4ll-manual.c
+++ b/src/libsystemd-network/test-ipv4ll-manual.c
@@ -15,7 +15,6 @@
 #include "parse-util.h"
 #include "string-util.h"
 #include "tests.h"
-#include "util.h"
 
 static void ll_handler(sd_ipv4ll *ll, int event, void *userdata) {
         assert_se(ll);

diff --git a/src/libsystemd-network/test-ipv4ll.c b/src/libsystemd-network/test-ipv4ll.c
index 2a078a502e70e1acd3462ee4ed6cdea898ef5d51..bb42930cf55d6992b418dc103e4922ada74b20ad 100644 (file)
--- a/src/libsystemd-network/test-ipv4ll.c
+++ b/src/libsystemd-network/test-ipv4ll.c
@@ -16,7 +16,6 @@
 #include "fd-util.h"
 #include "socket-util.h"
 #include "tests.h"
-#include "util.h"
 
 static bool verbose = false;
 static bool extended = false;

diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c
index 4468b45dd1edb82a4cdcd31d678f1a8a67943e26..45e7473c29f2eaea39d03f782d80bfb543a058ff 100644 (file)
--- a/src/libsystemd/sd-bus/bus-creds.c
+++ b/src/libsystemd/sd-bus/bus-creds.c
@@ -21,7 +21,6 @@
 #include "strv.h"
 #include "terminal-util.h"
 #include "user-util.h"
-#include "util.h"
 
 enum {
         CAP_OFFSET_INHERITABLE = 0,

diff --git a/src/libsystemd/sd-bus/bus-dump.c b/src/libsystemd/sd-bus/bus-dump.c
index 73939d8f7a7ec6e555099aa125c4a5beb918e1d0..6d24f3b1c97fa7f049ccaa6995ba1a1985d3da9b 100644 (file)
--- a/src/libsystemd/sd-bus/bus-dump.c
+++ b/src/libsystemd/sd-bus/bus-dump.c
@@ -17,7 +17,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
-#include "util.h"
 
 static char *indent(unsigned level, uint64_t flags) {
         char *p;

diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c
index 4d687cfac9e987a6abf08a6ce9bf75ae588f275a..413e2dd43f34dc0c523687567d8d86a273a40515 100644 (file)
--- a/src/libsystemd/sd-bus/bus-error.c
+++ b/src/libsystemd/sd-bus/bus-error.c
@@ -14,7 +14,6 @@
 #include "errno-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 
 BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = {
         SD_BUS_ERROR_MAP("org.freedesktop.DBus.Error.Failed",                           EACCES),

diff --git a/src/libsystemd/sd-bus/bus-signature.c b/src/libsystemd/sd-bus/bus-signature.c
index bd0842fdbc5fcb9830884e3197e20b1c33ccec4e..78c743648bbcaa789c8eceb57df4c566c66f7762 100644 (file)
--- a/src/libsystemd/sd-bus/bus-signature.c
+++ b/src/libsystemd/sd-bus/bus-signature.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <util.h>
-
 #include "sd-bus.h"
 
 #include "bus-signature.h"

diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c
index 317653bedc27cd5b78d0564dd94d5aba8151c44a..f9595e3477058d2537c601f10a24aad8249668e0 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-benchmark.c
+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
@@ -13,7 +13,6 @@
 #include "missing_resource.h"
 #include "string-util.h"
 #include "time-util.h"
-#include "util.h"
 
 #define MAX_SIZE (2*1024*1024)
 

diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c
index 09401a978444e21e6381dcbe0d49021db9ed3965..9b5efcce5975e6d5ce6cb17811ce0f269c8e6b6b 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/sd-bus/test-bus-chat.c
@@ -18,7 +18,6 @@
 #include "macro.h"
 #include "string-util.h"
 #include "tests.h"
-#include "util.h"
 
 static int match_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
         log_info("Match triggered! destination=%s interface=%s member=%s",

diff --git a/src/libsystemd/sd-bus/test-bus-marshal.c b/src/libsystemd/sd-bus/test-bus-marshal.c
index e1afbc2f1be5b1bf7d7eccf97fd6e3945c4e5ede..3361b0675e081cf75548a5a621faa905dc1bfe86 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-marshal.c
+++ b/src/libsystemd/sd-bus/test-bus-marshal.c
@@ -23,7 +23,6 @@
 #include "fileio.h"
 #include "log.h"
 #include "tests.h"
-#include "util.h"
 
 static void test_bus_path_encode_unique(void) {
         _cleanup_free_ char *a = NULL, *b = NULL, *c = NULL, *d = NULL, *e = NULL;

diff --git a/src/libsystemd/sd-bus/test-bus-objects.c b/src/libsystemd/sd-bus/test-bus-objects.c
index 949ef07c341dd71005ad7fff0fd6669da1f1335d..0d4a6db1e3bc308f5342e1c88e0bb4e54e974587 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-objects.c
+++ b/src/libsystemd/sd-bus/test-bus-objects.c
@@ -12,7 +12,6 @@
 #include "log.h"
 #include "macro.h"
 #include "strv.h"
-#include "util.h"
 
 struct context {
         int fds[2];

diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
index 199d10a00ea894aa427a9c3a5b5534cdb197cd73..80206a7d914938073858f91b9e91982fcfca67ed 100644 (file)
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
@@ -26,7 +26,6 @@
 #include "stat-util.h"
 #include "strv.h"
 #include "time-util.h"
-#include "util.h"
 
 #define SNDBUF_SIZE (8*1024*1024)
 

diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c
index f2e142457ba21aa27302c55dd02027d25f9194de..55a0ee730e89f21a4c9d41f287fd790782681bab 100644 (file)
--- a/src/libsystemd/sd-device/sd-device.c
+++ b/src/libsystemd/sd-device/sd-device.c
@@ -33,7 +33,6 @@
 #include "strv.h"
 #include "strxcpyx.h"
 #include "user-util.h"
-#include "util.h"
 
 int device_new_aux(sd_device **ret) {
         sd_device *device;

diff --git a/src/libsystemd/sd-device/test-sd-device-monitor.c b/src/libsystemd/sd-device/test-sd-device-monitor.c
index 9e64ba01c61ae654a280d5ef1bc4d8582fa1d164..4654ef709d10a34e9547cdfac9f775da6b6dce31 100644 (file)
--- a/src/libsystemd/sd-device/test-sd-device-monitor.c
+++ b/src/libsystemd/sd-device/test-sd-device-monitor.c
@@ -14,7 +14,6 @@
 #include "stat-util.h"
 #include "string-util.h"
 #include "tests.h"
-#include "util.h"
 #include "virt.h"
 
 static int monitor_handler(sd_device_monitor *m, sd_device *d, void *userdata) {

diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index 778070a5fb7896ba6296d894c4f2ac538c2e3ee3..1f611c6a25fe40789dc9851c8ea9497985fdbcdd 100644 (file)
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -16,6 +16,7 @@
 #include "glyph-util.h"
 #include "hashmap.h"
 #include "list.h"
+#include "logarithm.h"
 #include "macro.h"
 #include "memory-util.h"
 #include "missing_syscall.h"

diff --git a/src/libsystemd/sd-event/test-event.c b/src/libsystemd/sd-event/test-event.c
index 246658d024600670fea71e62a8e8da8d4b87c2ff..9ec988d76e61e90adb3c667a110e166f1cc4f7b1 100644 (file)
--- a/src/libsystemd/sd-event/test-event.c
+++ b/src/libsystemd/sd-event/test-event.c
@@ -21,7 +21,6 @@
 #include "string-util.h"
 #include "tests.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 static int prepare_handler(sd_event_source *s, void *userdata) {
         log_info("preparing %c", PTR_TO_INT(userdata));

diff --git a/src/libsystemd/sd-id128/sd-id128.c b/src/libsystemd/sd-id128/sd-id128.c
index 709c8ffb5750e62f93646cb2216cf0d7d4c4fe29..c8f051196df40b59507dab7a40853a108c510de6 100644 (file)
--- a/src/libsystemd/sd-id128/sd-id128.c
+++ b/src/libsystemd/sd-id128/sd-id128.c
@@ -16,7 +16,6 @@
 #include "missing_syscall.h"
 #include "random-util.h"
 #include "user-util.h"
-#include "util.h"
 
 _public_ char *sd_id128_to_string(sd_id128_t id, char s[_SD_ARRAY_STATIC SD_ID128_STRING_MAX]) {
         assert_return(s, NULL);

diff --git a/src/libsystemd/sd-journal/fsprg.h b/src/libsystemd/sd-journal/fsprg.h
index dfe2d7922205b494268ff61bac30bbbba6afe5d2..d3d88aab31a05b127218a73e9ed54c4269596c8a 100644 (file)
--- a/src/libsystemd/sd-journal/fsprg.h
+++ b/src/libsystemd/sd-journal/fsprg.h
@@ -26,7 +26,6 @@
 #include <sys/types.h>
 
 #include "macro.h"
-#include "util.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/libsystemd/sd-journal/journal-verify.c b/src/libsystemd/sd-journal/journal-verify.c
index ad4039dee0f1707b76f535f1b978b57755d9a055..34b1d8b90934c156a9bbb98e39ddde9ec0311e22 100644 (file)
--- a/src/libsystemd/sd-journal/journal-verify.c
+++ b/src/libsystemd/sd-journal/journal-verify.c
@@ -18,7 +18,6 @@
 #include "macro.h"
 #include "terminal-util.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 static void draw_progress(uint64_t p, usec_t *last_usec) {
         unsigned n, i, j, k;

diff --git a/src/libsystemd/sd-journal/test-catalog.c b/src/libsystemd/sd-journal/test-catalog.c
index ad0622117519a12251524f2de63edfaab508de9b..526b8200ba1897e2c7ced64203f1c6cdd44da70d 100644 (file)
--- a/src/libsystemd/sd-journal/test-catalog.c
+++ b/src/libsystemd/sd-journal/test-catalog.c
@@ -18,7 +18,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 static char** catalog_dirs = NULL;
 static const char *no_catalog_dirs[] = {

diff --git a/src/libsystemd/sd-journal/test-journal-init.c b/src/libsystemd/sd-journal/test-journal-init.c
index 80aff75bb969e4bffef0b0a97ae787c167ff6684..d5702db33009e7993717a9b2e65f6da7cbe18812 100644 (file)
--- a/src/libsystemd/sd-journal/test-journal-init.c
+++ b/src/libsystemd/sd-journal/test-journal-init.c
@@ -7,7 +7,6 @@
 #include "parse-util.h"
 #include "rm-rf.h"
 #include "tests.h"
-#include "util.h"
 
 int main(int argc, char *argv[]) {
         sd_journal *j;

diff --git a/src/libsystemd/sd-journal/test-journal-match.c b/src/libsystemd/sd-journal/test-journal-match.c
index ded67563d7af4c386c7e8ee55bc5d452ffc70a58..571a88c1ac627ffbee8faea31bb53d6030ca563f 100644 (file)
--- a/src/libsystemd/sd-journal/test-journal-match.c
+++ b/src/libsystemd/sd-journal/test-journal-match.c
@@ -9,7 +9,6 @@
 #include "log.h"
 #include "string-util.h"
 #include "tests.h"
-#include "util.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_(sd_journal_closep) sd_journal *j = NULL;

diff --git a/src/libsystemd/sd-journal/test-mmap-cache.c b/src/libsystemd/sd-journal/test-mmap-cache.c
index 6ec36931fda9ef3425910d3fd716e08214db6be0..e3dfbada3273a4a93645e5a3d050ef4e3e79d26f 100644 (file)
--- a/src/libsystemd/sd-journal/test-mmap-cache.c
+++ b/src/libsystemd/sd-journal/test-mmap-cache.c
@@ -9,7 +9,6 @@
 #include "macro.h"
 #include "mmap-cache.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 int main(int argc, char *argv[]) {
         MMapFileDescriptor *fx;

diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libsystemd/sd-login/sd-login.c
index f134f0a8c98aadf94de69f3fda475282690e41a9..872d39e9ab79673fb612b3461bb5182ecafe685d 100644 (file)
--- a/src/libsystemd/sd-login/sd-login.c
+++ b/src/libsystemd/sd-login/sd-login.c
@@ -27,7 +27,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "user-util.h"
-#include "util.h"
 
 /* Error codes:
  *

diff --git a/src/libsystemd/sd-netlink/netlink-message-rtnl.c b/src/libsystemd/sd-netlink/netlink-message-rtnl.c
index 109f3ee814d42f1feede36eacab5070e0fe9fe10..008e8022b1dbe376b7e2b6197d24658a567a888c 100644 (file)
--- a/src/libsystemd/sd-netlink/netlink-message-rtnl.c
+++ b/src/libsystemd/sd-netlink/netlink-message-rtnl.c
@@ -15,7 +15,6 @@
 #include "netlink-types.h"
 #include "netlink-util.h"
 #include "socket-util.h"
-#include "util.h"
 
 static bool rtnl_message_type_is_neigh(uint16_t type) {
         return IN_SET(type, RTM_NEWNEIGH, RTM_GETNEIGH, RTM_DELNEIGH);

diff --git a/src/libsystemd/sd-netlink/netlink-socket.c b/src/libsystemd/sd-netlink/netlink-socket.c
index 605e80916c7b4c41d05240d481b6ba2b7a9bfb7b..1da459c01489d933cb538e584ad137727e2c8b68 100644 (file)
--- a/src/libsystemd/sd-netlink/netlink-socket.c
+++ b/src/libsystemd/sd-netlink/netlink-socket.c
@@ -14,7 +14,6 @@
 #include "netlink-internal.h"
 #include "netlink-types.h"
 #include "socket-util.h"
-#include "util.h"
 
 static int broadcast_groups_get(sd_netlink *nl) {
         _cleanup_free_ uint32_t *groups = NULL;

diff --git a/src/libsystemd/sd-netlink/netlink-util.h b/src/libsystemd/sd-netlink/netlink-util.h
index d14392a018ef78638eba121359922d865a9068bf..72d16fa9a914c844590fc85595aac15b6349350b 100644 (file)
--- a/src/libsystemd/sd-netlink/netlink-util.h
+++ b/src/libsystemd/sd-netlink/netlink-util.h
@@ -9,7 +9,6 @@
 #include "in-addr-util.h"
 #include "ordered-set.h"
 #include "socket-util.h"
-#include "util.h"
 
 /* See struct rtvia in rtnetlink.h */
 typedef struct RouteVia {

diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c
index 3d6b07f39f038db7405334700d615f8f6b0c4f54..00687e5cc82dd1886782de2722c32313a56cd3e3 100644 (file)
--- a/src/libsystemd/sd-network/sd-network.c
+++ b/src/libsystemd/sd-network/sd-network.c
@@ -16,7 +16,6 @@
 #include "stdio-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 
 static int network_get_string(const char *field, char **ret) {
         _cleanup_free_ char *s = NULL;

diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c
index ac33e349c06c83063fb569e4edc0e53a5935a289..601f61bf639f2bae1a451044a5a92c7c1613d93a 100644 (file)
--- a/src/libsystemd/sd-path/sd-path.c
+++ b/src/libsystemd/sd-path/sd-path.c
@@ -12,7 +12,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "user-util.h"
-#include "util.h"
 
 static int from_environment(const char *envname, const char *fallback, const char **ret) {
         assert(ret);

diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index 0314ae1774357cb99181399693c61776d31fa07d..f16be0f4e1a90ccd8f651ecc8cf17a66aad03142 100644 (file)
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -13,7 +13,6 @@
 #include "logind-button.h"
 #include "missing_input.h"
 #include "string-util.h"
-#include "util.h"
 
 #define CONST_MAX5(a, b, c, d, e) CONST_MAX(CONST_MAX(a, b), CONST_MAX(CONST_MAX(c, d), e))
 

diff --git a/src/login/logind-device.c b/src/login/logind-device.c
index 592ee3b9d65e9c3645fe716a34fcfac7f78b7250..f6050345260c63b83fb4fb06527eb4625f39175f 100644 (file)
--- a/src/login/logind-device.c
+++ b/src/login/logind-device.c
@@ -5,7 +5,6 @@
 #include "alloc-util.h"
 #include "logind-device.h"
 #include "logind-seat-dbus.h"
-#include "util.h"
 
 Device* device_new(Manager *m, const char *sysfs, bool master) {
         Device *d;

diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
index 16612ddf180c6a5a01c01fc355e7219c837d7f93..9cf00a502f95f3acd14ca9db9e3ff315f7887cda 100644 (file)
--- a/src/login/logind-inhibit.c
+++ b/src/login/logind-inhibit.c
@@ -24,7 +24,6 @@
 #include "string-util.h"
 #include "tmpfile-util.h"
 #include "user-util.h"
-#include "util.h"
 
 static void inhibitor_remove_fifo(Inhibitor *i);
 

diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c
index 03a419229e47bc5569232cb8f24adcc7c6b28aa4..877b9c1af14faf12468f1de36c9a75b4427f81d3 100644 (file)
--- a/src/login/logind-seat-dbus.c
+++ b/src/login/logind-seat-dbus.c
@@ -17,7 +17,6 @@
 #include "missing_capability.h"
 #include "strv.h"
 #include "user-util.h"
-#include "util.h"
 
 static BUS_DEFINE_PROPERTY_GET_GLOBAL(property_get_const_true, "b", true);
 static BUS_DEFINE_PROPERTY_GET(property_get_can_tty, "b", Seat, seat_can_tty);

diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index d8ad424bfe5881883589ea762d20fb1bae087573..863b8cc3b48ceb44a6b1ad890405c5a46c384ae0 100644 (file)
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -23,7 +23,6 @@
 #include "string-util.h"
 #include "terminal-util.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 int seat_new(Seat** ret, Manager *m, const char *id) {
         _cleanup_(seat_freep) Seat *s = NULL;

diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
index 56f6307dcd32cf56b3c4e2504ae3ad0c96a252d6..ea4800d82761cb66edc0ddbb345b9cf6e800addf 100644 (file)
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -24,7 +24,6 @@
 #include "signal-util.h"
 #include "strv.h"
 #include "user-util.h"
-#include "util.h"
 
 static int property_get_user(
                 sd_bus *bus,

diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c
index 4f934dd01dc24bf5f8c439ff0d703aa4e1fab463..eccc1aeb5d46b1b026848ff05b548e69fdb7077f 100644 (file)
--- a/src/login/logind-session-device.c
+++ b/src/login/logind-session-device.c
@@ -17,7 +17,6 @@
 #include "missing_drm.h"
 #include "missing_input.h"
 #include "parse-util.h"
-#include "util.h"
 
 enum SessionDeviceNotifications {
         SESSION_DEVICE_RESUME,

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 5bd4abc474f3c931d670248157a2e4ad4349f9ab..85cb4eba9eadc90808a2bc0e870337417b59e1c1 100644 (file)
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -38,7 +38,6 @@
 #include "tmpfile-util.h"
 #include "uid-alloc-range.h"
 #include "user-util.h"
-#include "util.h"
 
 #define RELEASE_USEC (20*USEC_PER_SEC)
 

diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index e02ad754eebeaaada94aa2d4257552f612f023d2..5680a300f3c933f04863ac5f19d7b9e335113d6c 100644 (file)
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -35,7 +35,6 @@
 #include "uid-alloc-range.h"
 #include "unit-name.h"
 #include "user-util.h"
-#include "util.h"
 
 int user_new(User **ret,
              Manager *m,

diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c
index d79f753c9a0cce3893d14e6308d85f4c4c6a826e..0a8c02a2a26a964c11559e434319761764329c6f 100644 (file)
--- a/src/login/sysfs-show.c
+++ b/src/login/sysfs-show.c
@@ -11,7 +11,6 @@
 #include "string-util.h"
 #include "sysfs-show.h"
 #include "terminal-util.h"
-#include "util.h"
 
 static int show_sysfs_one(
                 const char *seat,

diff --git a/src/login/test-inhibit.c b/src/login/test-inhibit.c
index dbe79c7074d16eaaa52e10ed90e7d807208e8277..aefae277fc06a2419e7685f9aac326831afdb15a 100644 (file)
--- a/src/login/test-inhibit.c
+++ b/src/login/test-inhibit.c
@@ -8,7 +8,6 @@
 #include "bus-util.h"
 #include "fd-util.h"
 #include "macro.h"
-#include "util.h"
 
 static int inhibit(sd_bus *bus, const char *what) {
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;

diff --git a/src/machine/machine.c b/src/machine/machine.c
index 335a4e96fb91f820eac7806582699ab3ac6b35fc..de7b20ff2dbba78cc6d90feb3b7fb19890bad3c0 100644 (file)
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -32,7 +32,6 @@
 #include "tmpfile-util.h"
 #include "unit-name.h"
 #include "user-util.h"
-#include "util.h"
 
 Machine* machine_new(Manager *manager, MachineClass class, const char *name) {
         Machine *m;

diff --git a/src/network/netdev/fou-tunnel.c b/src/network/netdev/fou-tunnel.c
index acd609f2961c4d07b68fd0e7634fd7ed498ae4a8..7baec1529f465404f344032af61665d31578fbe5 100644 (file)
--- a/src/network/netdev/fou-tunnel.c
+++ b/src/network/netdev/fou-tunnel.c
@@ -13,7 +13,6 @@
 #include "parse-util.h"
 #include "string-table.h"
 #include "string-util.h"
-#include "util.h"
 
 static const char* const fou_encap_type_table[_NETDEV_FOO_OVER_UDP_ENCAP_MAX] = {
         [NETDEV_FOO_OVER_UDP_ENCAP_DIRECT] = "FooOverUDP",

diff --git a/src/network/netdev/l2tp-tunnel.c b/src/network/netdev/l2tp-tunnel.c
index 2bce0fc5b28cd7a6a360ee44b671fb31338e9bd6..7d51a619bd59b982a1ae6be51ab5306a5fba1455 100644 (file)
--- a/src/network/netdev/l2tp-tunnel.c
+++ b/src/network/netdev/l2tp-tunnel.c
@@ -15,7 +15,6 @@
 #include "socket-util.h"
 #include "string-table.h"
 #include "string-util.h"
-#include "util.h"
 
 static const char* const l2tp_l2spec_type_table[_NETDEV_L2TP_L2SPECTYPE_MAX] = {
         [NETDEV_L2TP_L2SPECTYPE_NONE]    = "none",

diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c
index 1e3f6a9c4b56189d358f8501ce8d7641cd7fd5d9..0da3dd4bd22108b8e3f40c1cc5913b58ae2f9dce 100644 (file)
--- a/src/network/netdev/macsec.c
+++ b/src/network/netdev/macsec.c
@@ -18,7 +18,6 @@
 #include "socket-util.h"
 #include "string-table.h"
 #include "string-util.h"
-#include "util.h"
 
 static void security_association_clear(SecurityAssociation *sa) {
         if (!sa)

diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c
index db414a8943791320567ca63ef7c492476daf6747..2addfeecaa818ba87d25073b04408be492cffeaa 100644 (file)
--- a/src/network/netdev/tunnel.c
+++ b/src/network/netdev/tunnel.c
@@ -18,7 +18,6 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "tunnel.h"
-#include "util.h"
 
 #define DEFAULT_IPV6_TTL   64
 #define IP6_FLOWINFO_FLOWLABEL  htobe32(0x000FFFFF)

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index 259cd312c9925b423f66dcd75b657b60f1b86fd7..107f19fd154871f9733aa29f3e390f2976fc42b5 100644 (file)
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -5,6 +5,7 @@
 
 #include "alloc-util.h"
 #include "firewall-util.h"
+#include "logarithm.h"
 #include "memory-util.h"
 #include "netlink-util.h"
 #include "networkd-address-pool.h"

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 95b08cb885f9e14658981026b573f400bcb067b9..4ed622cfe669a859181629157967c4d99b68c185 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -27,6 +27,7 @@
 #include "format-util.h"
 #include "fs-util.h"
 #include "glyph-util.h"
+#include "logarithm.h"
 #include "missing_network.h"
 #include "netlink-util.h"
 #include "network-internal.h"
@@ -66,7 +67,6 @@
 #include "tmpfile-util.h"
 #include "tuntap.h"
 #include "udev-util.h"
-#include "util.h"
 #include "vrf.h"
 
 bool link_ipv6_enabled(Link *link) {

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 41a0766f078ee5d53967a8f82edd5423ffb53ca7..d516918c786e6e2b3ec5a6b805447df36c007dfb 100644 (file)
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -42,7 +42,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "tclass.h"
-#include "util.h"
 
 /* Let's assume that anything above this number is a user misconfiguration. */
 #define MAX_NTP_SERVERS 128U

diff --git a/src/network/networkd-route-util.c b/src/network/networkd-route-util.c
index 036638209311f6376365e4be9c159ccf047d709a..84866d3f84b6bce5f000ce90f0a54aab6a6924a8 100644 (file)
--- a/src/network/networkd-route-util.c
+++ b/src/network/networkd-route-util.c
@@ -3,6 +3,7 @@
 #include <linux/rtnetlink.h>
 
 #include "alloc-util.h"
+#include "logarithm.h"
 #include "networkd-address.h"
 #include "networkd-link.h"
 #include "networkd-manager.h"

diff --git a/src/network/networkd-util.c b/src/network/networkd-util.c
index 69347d80ffdd0b34200d3bb3ceb3f5aa10a7332c..33352ba772ec34c722408bff13073d26c8d20536 100644 (file)
--- a/src/network/networkd-util.c
+++ b/src/network/networkd-util.c
@@ -3,6 +3,7 @@
 #include "condition.h"
 #include "conf-parser.h"
 #include "escape.h"
+#include "logarithm.h"
 #include "networkd-link.h"
 #include "networkd-util.h"
 #include "parse-util.h"

diff --git a/src/network/tc/fq.c b/src/network/tc/fq.c
index c588f385c7f4dfde43ba9adf37a4e4d2a1a9dbde..149a72e37c4156dd7b0a31179d0f83af023a72e4 100644 (file)
--- a/src/network/tc/fq.c
+++ b/src/network/tc/fq.c
@@ -6,6 +6,7 @@
 #include "alloc-util.h"
 #include "conf-parser.h"
 #include "fq.h"
+#include "logarithm.h"
 #include "netlink-util.h"
 #include "parse-util.h"
 #include "string-util.h"

diff --git a/src/network/tc/hhf.c b/src/network/tc/hhf.c
index 2d71a42c53d3c0b947290f606d8b257c29886207..d44522f98cc9292b6cf6fd06a098aacee01b3d2f 100644 (file)
--- a/src/network/tc/hhf.c
+++ b/src/network/tc/hhf.c
@@ -9,7 +9,6 @@
 #include "netlink-util.h"
 #include "parse-util.h"
 #include "string-util.h"
-#include "util.h"
 
 static int heavy_hitter_filter_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req) {
         HeavyHitterFilter *hhf;

diff --git a/src/network/wait-online/manager.c b/src/network/wait-online/manager.c
index 624029a81289576a4c1b2618a41abcd7d75832c5..43ac10704b7df030bab24b9c747a1cde17c48caa 100644 (file)
--- a/src/network/wait-online/manager.c
+++ b/src/network/wait-online/manager.c
@@ -10,7 +10,6 @@
 #include "netlink-util.h"
 #include "strv.h"
 #include "time-util.h"
-#include "util.h"
 
 static bool link_in_command_line_interfaces(Link *link, Manager *m) {
         assert(link);

diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c
index 9e6379ae7b2ecb8e7dd0169caf0618623b2bf5a8..bdb8985fbede4420d907ee0f71fdaaa363cbbc20 100644 (file)
--- a/src/nspawn/nspawn-cgroup.c
+++ b/src/nspawn/nspawn-cgroup.c
@@ -18,7 +18,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "user-util.h"
-#include "util.h"
 
 static int chown_cgroup_path(const char *path, uid_t uid_shift) {
         _cleanup_close_ int fd = -1;

diff --git a/src/nspawn/nspawn-expose-ports.c b/src/nspawn/nspawn-expose-ports.c
index bb54f8c1e77dc14a96545df7203c90a5871c52e1..a8b1437171161d46055e0288a7bcf9d91196bb2e 100644 (file)
--- a/src/nspawn/nspawn-expose-ports.c
+++ b/src/nspawn/nspawn-expose-ports.c
@@ -13,7 +13,6 @@
 #include "parse-util.h"
 #include "socket-util.h"
 #include "string-util.h"
-#include "util.h"
 
 int expose_port_parse(ExposePort **l, const char *s) {
         const char *split, *e;

diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c
index 536e3692311fcd4087ab2fb96f4cd1640149c204..3a0e155f3837c4f3da0fcca3fa1e6fb19d4cf342 100644 (file)
--- a/src/nspawn/nspawn-network.c
+++ b/src/nspawn/nspawn-network.c
@@ -25,7 +25,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "udev-util.h"
-#include "util.h"
 
 #define HOST_HASH_KEY SD_ID128_MAKE(1a,37,6f,c7,46,ec,45,0b,ad,a3,d5,31,06,60,5d,b1)
 #define CONTAINER_HASH_KEY SD_ID128_MAKE(c3,c4,f9,19,b5,57,b2,1c,e6,cf,14,27,03,9c,ee,a2)

diff --git a/src/nspawn/nspawn-register.c b/src/nspawn/nspawn-register.c
index c78bead4a4bc35c3953f676165c4fdefcce9006d..8995e0f7b38c47a58644ec42b183cae3fc01efac 100644 (file)
--- a/src/nspawn/nspawn-register.c
+++ b/src/nspawn/nspawn-register.c
@@ -11,7 +11,6 @@
 #include "special.h"
 #include "stat-util.h"
 #include "strv.h"
-#include "util.h"
 
 static int append_machine_properties(
                 sd_bus_message *m,

diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c
index e06de68072e6a896acf3c7f5afe7aac11f342279..05bde1c7567772e01591e1e98ce014e11af0b54b 100644 (file)
--- a/src/nspawn/nspawn-settings.c
+++ b/src/nspawn/nspawn-settings.c
@@ -16,7 +16,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "user-util.h"
-#include "util.h"
 
 Settings *settings_new(void) {
         Settings *s;

diff --git a/src/nspawn/nspawn-setuid.c b/src/nspawn/nspawn-setuid.c
index 34758d8b0fa9324c48b638c41ffcacf67c120bbc..475147c2a02259f1d8bbd401d932283cf3be4d1a 100644 (file)
--- a/src/nspawn/nspawn-setuid.c
+++ b/src/nspawn/nspawn-setuid.c
@@ -17,7 +17,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "user-util.h"
-#include "util.h"
 
 static int spawn_getent(const char *database, const char *key, pid_t *rpid) {
         int pipe_fds[2], r;

diff --git a/src/pstore/pstore.c b/src/pstore/pstore.c
index d820ceb9f68c0b9b982b0f05219d2d9da319b613..f8e6582d5bf2dcc47dbf11f17596f5be37a6d1ce 100644 (file)
--- a/src/pstore/pstore.c
+++ b/src/pstore/pstore.c
@@ -45,7 +45,6 @@
 #include "strv.h"
 #include "tmpfile-util.h"
 #include "user-util.h"
-#include "util.h"
 
 /* Command line argument handling */
 typedef enum PStoreStorage {

diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c
index 575965c470ea463a288291c6b22760a97e4a73fc..ef5fec3f102ec424eef6a3e13569f6f76fce5884 100644 (file)
--- a/src/quotacheck/quotacheck.c
+++ b/src/quotacheck/quotacheck.c
@@ -13,7 +13,6 @@
 #include "process-util.h"
 #include "signal-util.h"
 #include "string-util.h"
-#include "util.h"
 
 static bool arg_skip = false;
 static bool arg_force = false;

diff --git a/src/rc-local-generator/rc-local-generator.c b/src/rc-local-generator/rc-local-generator.c
index c2b9e642172d74bd45c4b49d8524996ebbc68208..d8c06b1d2dcdf1bc78d6beb652ffdd931dcea52c 100644 (file)
--- a/src/rc-local-generator/rc-local-generator.c
+++ b/src/rc-local-generator/rc-local-generator.c
@@ -8,7 +8,6 @@
 #include "log.h"
 #include "mkdir-label.h"
 #include "string-util.h"
-#include "util.h"
 
 static const char *arg_dest = NULL;
 

diff --git a/src/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c
index d747d60d5dbc343e0758600e60d52f4d680988a0..4515592387baa3323c302b58e4114a9cb3181ae5 100644 (file)
--- a/src/remount-fs/remount-fs.c
+++ b/src/remount-fs/remount-fs.c
@@ -18,7 +18,6 @@
 #include "process-util.h"
 #include "signal-util.h"
 #include "strv.h"
-#include "util.h"
 
 /* Goes through /etc/fstab and remounts all API file systems, applying options that are in /etc/fstab that systemd
  * might not have respected */

diff --git a/src/reply-password/reply-password.c b/src/reply-password/reply-password.c
index a9aa4b832a966636201717b4d646d273c2c4b64d..feb1d1ef7c48efd4012675b9937976d52ec1b3a1 100644 (file)
--- a/src/reply-password/reply-password.c
+++ b/src/reply-password/reply-password.c
@@ -13,7 +13,6 @@
 #include "memory-util.h"
 #include "socket-util.h"
 #include "string-util.h"
-#include "util.h"
 
 static int send_on_socket(int fd, const char *socket_name, const void *packet, size_t size) {
         union sockaddr_union sa = {};

diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
index 88c52e411b3b7bc1b1bc1c222c43dc8ccf049499..f90e5974c4dc32031854a5d0269ce4c2ba082897 100644 (file)
--- a/src/resolve/resolved-dns-packet.c
+++ b/src/resolve/resolved-dns-packet.c
@@ -14,7 +14,6 @@
 #include "strv.h"
 #include "unaligned.h"
 #include "utf8.h"
-#include "util.h"
 
 #define EDNS0_OPT_DO (1<<15)
 

diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c
index 8aec9b21e434b9c477e5bfb693d64755b4fcb6da..773b25d8166da43cf026f0ea88f9e047487c8817 100644 (file)
--- a/src/rfkill/rfkill.c
+++ b/src/rfkill/rfkill.c
@@ -24,7 +24,6 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "udev-util.h"
-#include "util.h"
 
 /* Note that any write is delayed until exit and the rfkill state will not be
  * stored for rfkill indices that disappear after a change. */

diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
index 2bdc529b80331ea1a0fd730333169b4446cf0767..c6c673984d20672f094539d84063089794757f97 100644 (file)
--- a/src/shared/acl-util.c
+++ b/src/shared/acl-util.c
@@ -10,7 +10,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "user-util.h"
-#include "util.h"
 
 int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *ret_entry) {
         acl_entry_t i;

diff --git a/src/shared/btrfs-util.c b/src/shared/btrfs-util.c
index 58ba286a2404c0145faab813e44f1b61d8afdc07..92a9bcde4f7d7a8d50c1e03794b7e0056853ca99 100644 (file)
--- a/src/shared/btrfs-util.c
+++ b/src/shared/btrfs-util.c
@@ -31,7 +31,6 @@
 #include "stat-util.h"
 #include "string-util.h"
 #include "time-util.h"
-#include "util.h"
 
 /* WARNING: Be careful with file system ioctls! When we get an fd, we
  * need to make sure it either refers to only a regular file or

diff --git a/src/shared/calendarspec.h b/src/shared/calendarspec.h
index d756efcdb799e4f82b2d97f53c26d8f0515a55de..5a04ac018d4269e0d660222b6b01157ae976d225 100644 (file)
--- a/src/shared/calendarspec.h
+++ b/src/shared/calendarspec.h
@@ -7,7 +7,6 @@
 #include <stdbool.h>
 
 #include "time-util.h"
-#include "util.h"
 
 typedef struct CalendarComponent {
         int start;

diff --git a/src/shared/cpu-set-util.c b/src/shared/cpu-set-util.c
index b1873b6409dc729b1fc2dfcbad620346a33fb0a2..34c13cf9692d9644fc30f16d38d686cbb208ce6f 100644 (file)
--- a/src/shared/cpu-set-util.c
+++ b/src/shared/cpu-set-util.c
@@ -18,7 +18,6 @@
 #include "stat-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 
 char* cpu_set_to_string(const CPUSet *a) {
         _cleanup_free_ char *str = NULL;

diff --git a/src/shared/devnode-acl.c b/src/shared/devnode-acl.c
index 66e3a40f2f648f2079bffecbb59c62e8d5e25815..5911c2f84d6c93c3c4865a4631567e4f868b9457 100644 (file)
--- a/src/shared/devnode-acl.c
+++ b/src/shared/devnode-acl.c
@@ -15,7 +15,6 @@
 #include "glyph-util.h"
 #include "set.h"
 #include "string-util.h"
-#include "util.h"
 
 static int flush_acl(acl_t acl) {
         acl_entry_t i;

diff --git a/src/shared/elf-util.c b/src/shared/elf-util.c
index 181735409d42d796e1dca9d8424e6f2046baa9c7..779154541667d668256ec7a4eb6084fa97fe243f 100644 (file)
--- a/src/shared/elf-util.c
+++ b/src/shared/elf-util.c
@@ -24,7 +24,6 @@
 #include "process-util.h"
 #include "rlimit-util.h"
 #include "string-util.h"
-#include "util.h"
 
 #define FRAMES_MAX 64
 #define THREADS_MAX 64

diff --git a/src/shared/exec-util.c b/src/shared/exec-util.c
index 19ddf0498625d72bd973a68ee4af3475b86c8bfe..cd57016964efc412c522a42348dc1005b8558934 100644 (file)
--- a/src/shared/exec-util.c
+++ b/src/shared/exec-util.c
@@ -29,7 +29,6 @@
 #include "strv.h"
 #include "terminal-util.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 /* Put this test here for a lack of better place */
 assert_cc(EAGAIN == EWOULDBLOCK);

diff --git a/src/shared/format-table.c b/src/shared/format-table.c
index b62445faa6a0c7e2ce77fcf1e4e8a41cc754d5b2..0549c9f12ef1153693954af5eecd71cbcfcdbbf8 100644 (file)
--- a/src/shared/format-table.c
+++ b/src/shared/format-table.c
@@ -30,7 +30,6 @@
 #include "time-util.h"
 #include "user-util.h"
 #include "utf8.h"
-#include "util.h"
 
 #define DEFAULT_WEIGHT 100
 

diff --git a/src/shared/hostname-setup.c b/src/shared/hostname-setup.c
index 0fac0ecab711f1d6677e50e11ac14fd363d4d9d1..0a560702243fa7a4296ce51efe3a6b3a482a4482 100644 (file)
--- a/src/shared/hostname-setup.c
+++ b/src/shared/hostname-setup.c
@@ -17,7 +17,6 @@
 #include "proc-cmdline.h"
 #include "string-table.h"
 #include "string-util.h"
-#include "util.h"
 
 static int sethostname_idempotent_full(const char *s, bool really) {
         struct utsname u;

diff --git a/src/shared/logs-show.h b/src/shared/logs-show.h
index 71e39ebb1fa554aa11ef3d97b6d06d7f2ff73c95..0800b55c03d10f0a6db9c6ef28b22ff30a06641e 100644 (file)
--- a/src/shared/logs-show.h
+++ b/src/shared/logs-show.h
@@ -11,7 +11,6 @@
 #include "macro.h"
 #include "output-mode.h"
 #include "time-util.h"
-#include "util.h"
 
 int show_journal_entry(
                 FILE *f,

diff --git a/src/shared/machine-id-setup.c b/src/shared/machine-id-setup.c
index df4ac419cbb3a55a1ad68bfb829f37d9d46df316..c694a185ba9592847a0d946e36a5e3656427132a 100644 (file)
--- a/src/shared/machine-id-setup.c
+++ b/src/shared/machine-id-setup.c
@@ -24,7 +24,6 @@
 #include "string-util.h"
 #include "sync-util.h"
 #include "umask-util.h"
-#include "util.h"
 #include "virt.h"
 
 static int generate_machine_id(const char *root, sd_id128_t *ret) {

diff --git a/src/shared/pager.c b/src/shared/pager.c
index dc717cd1fe8e23c0caa0c9740b3ed40b4d5c614a..74a6f9fd419cc82049a48b846eea30ef45a39886 100644 (file)
--- a/src/shared/pager.c
+++ b/src/shared/pager.c
@@ -25,7 +25,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
-#include "util.h"
 
 static pid_t pager_pid = 0;
 

diff --git a/src/shared/pretty-print.c b/src/shared/pretty-print.c
index 98619c25d4d7c49ae3b6f630d94b45217f6c6dd7..f1658395369983b22c0310fb516d9d027b409e04 100644 (file)
--- a/src/shared/pretty-print.c
+++ b/src/shared/pretty-print.c
@@ -16,7 +16,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
-#include "util.h"
 
 bool urlify_enabled(void) {
 #if ENABLE_URLIFY

diff --git a/src/shared/spawn-ask-password-agent.c b/src/shared/spawn-ask-password-agent.c
index 902d7543a597312658ca7e2705e4e82b8794de4d..d34cfffa839a2165ab060cc109f4b0ab0b1100f1 100644 (file)
--- a/src/shared/spawn-ask-password-agent.c
+++ b/src/shared/spawn-ask-password-agent.c
@@ -8,7 +8,6 @@
 #include "log.h"
 #include "process-util.h"
 #include "spawn-ask-password-agent.h"
-#include "util.h"
 
 static pid_t agent_pid = 0;
 

diff --git a/src/shared/spawn-polkit-agent.c b/src/shared/spawn-polkit-agent.c
index 3abb02d03e703aea26d0c9b45810ba95b4b05d12..ce3c5fb948646490733513c6240d7b51980cad0a 100644 (file)
--- a/src/shared/spawn-polkit-agent.c
+++ b/src/shared/spawn-polkit-agent.c
@@ -15,7 +15,6 @@
 #include "spawn-polkit-agent.h"
 #include "stdio-util.h"
 #include "time-util.h"
-#include "util.h"
 
 #if ENABLE_POLKIT
 static pid_t agent_pid = 0;

diff --git a/src/shared/tests.c b/src/shared/tests.c
index a65080cbf43f9773b38350391b60a891d58394b5..ad6f978f98b70d6444c59fd41e668d53a231a994 100644 (file)
--- a/src/shared/tests.c
+++ b/src/shared/tests.c
@@ -6,7 +6,6 @@
 #include <sys/mman.h>
 #include <sys/mount.h>
 #include <sys/wait.h>
-#include <util.h>
 
 /* When we include libgen.h because we need dirname() we immediately
  * undefine basename() since libgen.h defines it as a macro to the POSIX

diff --git a/src/shared/utmp-wtmp.h b/src/shared/utmp-wtmp.h
index 188d011fdd71e24737c12616329579f7c93041d2..97be719abf80f52df1ce653b2772ecfc2b420fc6 100644 (file)
--- a/src/shared/utmp-wtmp.h
+++ b/src/shared/utmp-wtmp.h
@@ -5,7 +5,6 @@
 #include <sys/types.h>
 
 #include "time-util.h"
-#include "util.h"
 
 #if ENABLE_UTMP
 #include <utmpx.h>

diff --git a/src/shared/watchdog.h b/src/shared/watchdog.h
index a0a80efc9762081d5df73b3f059edd63f1a21710..a490183fa1290e481b456986939d30e250eba0df 100644 (file)
--- a/src/shared/watchdog.h
+++ b/src/shared/watchdog.h
@@ -4,7 +4,6 @@
 #include <stdbool.h>
 
 #include "time-util.h"
-#include "util.h"
 
 const char *watchdog_get_device(void);
 usec_t watchdog_get_last_ping(clockid_t clock);

diff --git a/src/shutdown/test-umount.c b/src/shutdown/test-umount.c
index c92105b62b4a1e7ec86c3f48b295b626a3fabb62..80ec9b6dd6726d183c7cb9fbf0fb5fff2449a2aa 100644 (file)
--- a/src/shutdown/test-umount.c
+++ b/src/shutdown/test-umount.c
@@ -7,7 +7,6 @@
 #include "string-util.h"
 #include "tests.h"
 #include "umount.h"
-#include "util.h"
 
 static void test_mount_points_list_one(const char *fname) {
         _cleanup_(mount_points_list_free) LIST_HEAD(MountPoint, mp_list_head);

diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
index e650b821700dfc0a6fba48e703e98899b1aac634..c442f5544b5e42f7ac5cab5d575a4572220f8445 100644 (file)
--- a/src/shutdown/umount.c
+++ b/src/shutdown/umount.c
@@ -43,7 +43,6 @@
 #include "strv.h"
 #include "sync-util.h"
 #include "umount.h"
-#include "util.h"
 #include "virt.h"
 
 static void mount_point_free(MountPoint **head, MountPoint *m) {

diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c
index fc5aaa9bac39deb9140d5df1ee690a735c500b11..54cd943af7ab8af992946619394443d51951a395 100644 (file)
--- a/src/system-update-generator/system-update-generator.c
+++ b/src/system-update-generator/system-update-generator.c
@@ -10,7 +10,6 @@
 #include "special.h"
 #include "string-util.h"
 #include "unit-file.h"
-#include "util.h"
 
 /*
  * Implements the logic described in systemd.offline-updates(7).

diff --git a/src/sysupdate/sysupdate-partition.c b/src/sysupdate/sysupdate-partition.c
index 812007fa3b3fb5cd58776e12c45f07df5a56d500..fa46574fd6bbeec1d5ecfd5e459d3a98939575b3 100644 (file)
--- a/src/sysupdate/sysupdate-partition.c
+++ b/src/sysupdate/sysupdate-partition.c
@@ -10,7 +10,6 @@
 #include "stdio-util.h"
 #include "string-util.h"
 #include "sysupdate-partition.h"
-#include "util.h"
 
 void partition_info_destroy(PartitionInfo *p) {
         assert(p);

diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index 3c5df6c3ec86cfec790b1ec2e3569111c17f7019..9b465e8c84857244363f83422b419e8844e57b74 100644 (file)
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -25,7 +25,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "unit-name.h"
-#include "util.h"
 
 static const struct {
         const char *path;

diff --git a/src/test/meson.build b/src/test/meson.build
index 413dcdec6214cd643f3eafdace5180980685c5b6..12e65a8c4336a26204430447e441b105583652e5 100644 (file)
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -211,7 +211,7 @@ tests += [
 
         [files('test-limits-util.c')],
 
-        [files('test-util.c')],
+        [files('test-logarithm.c')],
 
         [files('test-macro.c')],
 

diff --git a/src/test/test-af-list.c b/src/test/test-af-list.c
index 644bc9e27b84107d328427ec921752f6aa3fa7d6..45655d792ed44c917308ff716a70c9ac17c25986 100644 (file)
--- a/src/test/test-af-list.c
+++ b/src/test/test-af-list.c
@@ -5,7 +5,6 @@
 #include "macro.h"
 #include "string-util.h"
 #include "tests.h"
-#include "util.h"
 
 _unused_
 static const struct af_name* lookup_af(register const char *str, register GPERF_LEN_TYPE len);

diff --git a/src/test/test-architecture.c b/src/test/test-architecture.c
index b542fe1ddf1c00a3dfa2b0acef92c3448d63c168..043978e9a6274aabda31d50aea134b5122ad2d26 100644 (file)
--- a/src/test/test-architecture.c
+++ b/src/test/test-architecture.c
@@ -4,7 +4,6 @@
 #include "errno-util.h"
 #include "log.h"
 #include "tests.h"
-#include "util.h"
 #include "virt.h"
 
 int main(int argc, char *argv[]) {

diff --git a/src/test/test-async.c b/src/test/test-async.c
index 8eefad50447bbe59c060ba7fc63b97b29eb2be3f..b97fedcfc6d37d66664acb96666d6079e0388e4a 100644 (file)
--- a/src/test/test-async.c
+++ b/src/test/test-async.c
@@ -6,7 +6,6 @@
 #include "async.h"
 #include "macro.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 static bool test_async = false;
 

diff --git a/src/test/test-barrier.c b/src/test/test-barrier.c
index 50ceb3a35595783f693150aadbd98a414c425f87..b255dba068235472c67153355966d80dfd1e5cff 100644 (file)
--- a/src/test/test-barrier.c
+++ b/src/test/test-barrier.c
@@ -18,7 +18,6 @@
 #include "errno-util.h"
 #include "tests.h"
 #include "time-util.h"
-#include "util.h"
 #include "virt.h"
 
 /* 20ms to test deadlocks; All timings use multiples of this constant as

diff --git a/src/test/test-boot-timestamps.c b/src/test/test-boot-timestamps.c
index a9875defdd92a7e7ab6322820bd3f8ed498e3176..53e378eaab6552138839d3af67adc07038551934 100644 (file)
--- a/src/test/test-boot-timestamps.c
+++ b/src/test/test-boot-timestamps.c
@@ -9,7 +9,6 @@
 #include "errno-util.h"
 #include "log.h"
 #include "tests.h"
-#include "util.h"
 
 static int test_acpi_fpdt(void) {
         usec_t loader_start, loader_exit;

diff --git a/src/test/test-btrfs.c b/src/test/test-btrfs.c
index 77ec80190313556a3ab7c5edc81c82b73f543acb..67acba23a79d548791b8013eeec4d08cdb7bd231 100644 (file)
--- a/src/test/test-btrfs.c
+++ b/src/test/test-btrfs.c
@@ -8,7 +8,6 @@
 #include "format-util.h"
 #include "log.h"
 #include "string-util.h"
-#include "util.h"
 
 int main(int argc, char *argv[]) {
         BtrfsQuotaInfo quota;

diff --git a/src/test/test-cap-list.c b/src/test/test-cap-list.c
index 38f742032460c0bcba85fb3e8ff230e0751ab339..68f0461a6219a9d55618c381274346d7d13e7ca2 100644 (file)
--- a/src/test/test-cap-list.c
+++ b/src/test/test-cap-list.c
@@ -9,7 +9,6 @@
 #include "parse-util.h"
 #include "string-util.h"
 #include "tests.h"
-#include "util.h"
 
 /* verify the capability parser */
 TEST(cap_list) {

diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c
index 7113b07a9525fbae30690eea443de308cccc88e5..0b286ed8e458a07fa7c4ad0d784b0cb1a3d23bde 100644 (file)
--- a/src/test/test-cgroup-util.c
+++ b/src/test/test-cgroup-util.c
@@ -15,7 +15,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "user-util.h"
-#include "util.h"
 #include "version.h"
 
 static void check_p_d_u(const char *path, int code, const char *result) {

diff --git a/src/test/test-conf-files.c b/src/test/test-conf-files.c
index da8f3a97f2101b7e1dc41929bf7d8f735760d1e4..beda749fb88b5fb873f2d478f29dd8430e371b46 100644 (file)
--- a/src/test/test-conf-files.c
+++ b/src/test/test-conf-files.c
@@ -19,7 +19,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "user-util.h"
-#include "util.h"
 
 static void setup_test_dir(char *tmp_dir, const char *files, ...) {
         va_list ap;

diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c
index 8c27dcac3f6d59b14660f0ce4010edc9c88a22fc..0acb4131b5928d175d6794eeb6e88a91e35759ee 100644 (file)
--- a/src/test/test-conf-parser.c
+++ b/src/test/test-conf-parser.c
@@ -9,7 +9,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 static void test_config_parse_path_one(const char *rvalue, const char *expected) {
         _cleanup_free_ char *path = NULL;

diff --git a/src/test/test-copy.c b/src/test/test-copy.c
index 4091b425d16b5919977e584b11e122837891e21f..e4e38ac731b873f39b9853f74f34bc3ee49fe1f2 100644 (file)
--- a/src/test/test-copy.c
+++ b/src/test/test-copy.c
@@ -20,7 +20,6 @@
 #include "tests.h"
 #include "tmpfile-util.h"
 #include "user-util.h"
-#include "util.h"
 #include "xattr-util.h"
 
 TEST(copy_file) {

diff --git a/src/test/test-ellipsize.c b/src/test/test-ellipsize.c
index 7317193363ac76ae490480e039b52563969391c1..b10db0ae9dd14ac6efc355fbfb28011f868313a1 100644 (file)
--- a/src/test/test-ellipsize.c
+++ b/src/test/test-ellipsize.c
@@ -8,7 +8,6 @@
 #include "strv.h"
 #include "terminal-util.h"
 #include "tests.h"
-#include "util.h"
 #include "utf8.h"
 
 static void test_ellipsize_mem_one(const char *s, size_t old_length, size_t new_length) {

diff --git a/src/test/test-env-util.c b/src/test/test-env-util.c
index cc37d96327ba6fd4b5b3daf7c46f1a5e66faddf5..4796e3c2080f01dfaf6a7f6afc89732c7d78455f 100644 (file)
--- a/src/test/test-env-util.c
+++ b/src/test/test-env-util.c
@@ -10,7 +10,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "tests.h"
-#include "util.h"
 
 TEST(strv_env_delete) {
         _cleanup_strv_free_ char **a = NULL, **b = NULL, **c = NULL, **d = NULL;

diff --git a/src/test/test-errno-list.c b/src/test/test-errno-list.c
index 6c8f384cab5300eb6750b645afa0a71a78918816..f91a1f770f0047142c6a7ef00a25eccb0fcdf052 100644 (file)
--- a/src/test/test-errno-list.c
+++ b/src/test/test-errno-list.c
@@ -7,7 +7,6 @@
 #include "macro.h"
 #include "string-util.h"
 #include "tests.h"
-#include "util.h"
 
 TEST(errno_list) {
         for (size_t i = 0; i < ELEMENTSOF(errno_names); i++) {

diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 0283caeca618227e0513a3187eeeaf6ec8679581..51c3e755e04efe8618c272ae6319eea2dcac743f 100644 (file)
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -32,7 +32,6 @@
 #include "tmpfile-util.h"
 #include "unit.h"
 #include "user-util.h"
-#include "util.h"
 #include "virt.h"
 
 static char *user_runtime_unit_dir = NULL;

diff --git a/src/test/test-fdset.c b/src/test/test-fdset.c
index 5d63eeee37c605d708818f7e8e948c1c2f80333d..b6ad290eef91dd055f612be8cfd92e7caf75ea51 100644 (file)
--- a/src/test/test-fdset.c
+++ b/src/test/test-fdset.c
@@ -8,7 +8,6 @@
 #include "macro.h"
 #include "tests.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 TEST(fdset_new_fill) {
         int fd = -1;

diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
index ba6dd9ace9d4ed775f2adfb492ca3604f22db7e0..6f27cd43d674fc7dc84fbd3a46727815290fe2b6 100644 (file)
--- a/src/test/test-fileio.c
+++ b/src/test/test-fileio.c
@@ -24,7 +24,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 TEST(parse_env_file) {
         _cleanup_(unlink_tempfilep) char

diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c
index 9c1ced7591a81c0197d4e5101be3641b8b62fa89..d0259843b6723a43d57e4380be5299855b83c028 100644 (file)
--- a/src/test/test-fs-util.c
+++ b/src/test/test-fs-util.c
@@ -22,7 +22,6 @@
 #include "tmpfile-util.h"
 #include "umask-util.h"
 #include "user-util.h"
-#include "util.h"
 #include "virt.h"
 
 static const char *arg_test_dir = NULL;

diff --git a/src/test/test-gpt.c b/src/test/test-gpt.c
index 5037f498bb30f88ac955ae6c7e1ab5f3791c116d..8c313c66cc894e4070dce7cb8d1c361f6b345cdd 100644 (file)
--- a/src/test/test-gpt.c
+++ b/src/test/test-gpt.c
@@ -8,7 +8,6 @@
 #include "strv.h"
 #include "terminal-util.h"
 #include "tests.h"
-#include "util.h"
 
 TEST(gpt_types_against_architectures) {
         int r;

diff --git a/src/test/test-hashmap.c b/src/test/test-hashmap.c
index dbf762cc0b1f8316c51c26d0ce677034b9d7a0ed..5daa0e64f6542d40a24882a5fadf39601de71402 100644 (file)
--- a/src/test/test-hashmap.c
+++ b/src/test/test-hashmap.c
@@ -3,7 +3,6 @@
 #include "hashmap.h"
 #include "string-util.h"
 #include "tests.h"
-#include "util.h"
 
 unsigned custom_counter = 0;
 static void custom_destruct(void* p) {

diff --git a/src/test/test-json.c b/src/test/test-json.c
index 946c827ccf008915b288d60a66f80b02d629c59b..17ad2017f8c966aab547440c6579876e68408280 100644 (file)
--- a/src/test/test-json.c
+++ b/src/test/test-json.c
@@ -12,7 +12,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "tests.h"
-#include "util.h"
 
 static void test_tokenizer_one(const char *data, ...) {
         unsigned line = 0, column = 0;

diff --git a/src/test/test-list.c b/src/test/test-list.c
index 2c764d7b71127fa7588a71ab51768290d23a48a7..ea45f5b95cf0cd8e4004fa569859037639cbc0a6 100644 (file)
--- a/src/test/test-list.c
+++ b/src/test/test-list.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "list.h"
-#include "util.h"
 
 int main(int argc, const char *argv[]) {
         size_t i;

diff --git a/src/test/test-locale-util.c b/src/test/test-locale-util.c
index 9f50c6227fa8abc995acc4372907c3dd80639b30..aa501b650aa0b5ba1f1cc88ef163dafb5092677a 100644 (file)
--- a/src/test/test-locale-util.c
+++ b/src/test/test-locale-util.c
@@ -6,7 +6,6 @@
 #include "macro.h"
 #include "strv.h"
 #include "tests.h"
-#include "util.h"
 
 TEST(get_locales) {
         _cleanup_strv_free_ char **locales = NULL;

diff --git a/src/test/test-log.c b/src/test/test-log.c
index ae3d073d827fca91fb3a8951e3b5344fade5cb41..f21d88f39ab7231f54bcf9544b73401c492b90cb 100644 (file)
--- a/src/test/test-log.c
+++ b/src/test/test-log.c
@@ -7,7 +7,6 @@
 #include "log.h"
 #include "process-util.h"
 #include "string-util.h"
-#include "util.h"
 
 assert_cc(IS_SYNTHETIC_ERRNO(SYNTHETIC_ERRNO(EINVAL)));
 assert_cc(!IS_SYNTHETIC_ERRNO(EINVAL));

diff --git a/src/test/test-util.c b/src/test/test-logarithm.c
similarity index 98%
rename from src/test/test-util.c
rename to src/test/test-logarithm.c
index 8d0c4a3a42dc175b2c425ddb0994a7bba7cc6b77..b6818b422cf167d78371cb2f6932643d5240254a 100644 (file)
--- a/src/test/test-util.c
+++ b/src/test/test-logarithm.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "logarithm.h"
 #include "tests.h"
-#include "util.h"
 
 TEST(LOG2ULL) {
         assert_se(LOG2ULL(0) == 0);

diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c
index 37acc782eb862094db673c72952ade9c5ed76fc6..e4d763ecd57fc5c72bc60686a8b3243ef40e029b 100644 (file)
--- a/src/test/test-namespace.c
+++ b/src/test/test-namespace.c
@@ -11,7 +11,6 @@
 #include "string-util.h"
 #include "tests.h"
 #include "user-util.h"
-#include "util.h"
 #include "virt.h"
 
 TEST(namespace_cleanup_tmpdir) {

diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index f3987619826b35d714df46d802caa1a8e610b645..06b9793fe31a4d19f36d623d70b856d58dbe8d75 100644 (file)
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -16,7 +16,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 TEST(print_paths) {
         log_info("DEFAULT_PATH=%s", DEFAULT_PATH);

diff --git a/src/test/test-path.c b/src/test/test-path.c
index 4066f6ad9395e2b42cdd8444f228f2e9fb51b5f9..f325b4e51a0564e705130091de8aebbba67bb863 100644 (file)
--- a/src/test/test-path.c
+++ b/src/test/test-path.c
@@ -17,7 +17,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "unit.h"
-#include "util.h"
 
 typedef void (*test_function_t)(Manager *m);
 

diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c
index a9b2f537ca0b934011e4c6c659150f5f890720b6..7e4b5d82557204f12c67fd0603fdd3823550f6a0 100644 (file)
--- a/src/test/test-process-util.c
+++ b/src/test/test-process-util.c
@@ -34,7 +34,6 @@
 #include "terminal-util.h"
 #include "tests.h"
 #include "user-util.h"
-#include "util.h"
 #include "virt.h"
 
 static void test_get_process_comm_one(pid_t pid) {

diff --git a/src/test/test-selinux.c b/src/test/test-selinux.c
index 3eb7ad30cf5e66daa631876733adfe202ce98612..717cb0db16d37f5898e82154a2146509e4e96935 100644 (file)
--- a/src/test/test-selinux.c
+++ b/src/test/test-selinux.c
@@ -9,7 +9,6 @@
 #include "string-util.h"
 #include "tests.h"
 #include "time-util.h"
-#include "util.h"
 
 static void test_testing(void) {
         bool b;

diff --git a/src/test/test-sleep.c b/src/test/test-sleep.c
index 799e93dcedc53284f9afbd0e94a259cee78af988..de64f920d17c6bc2d8b49132d8f659bc206ad3a3 100644 (file)
--- a/src/test/test-sleep.c
+++ b/src/test/test-sleep.c
@@ -15,7 +15,6 @@
 #include "sleep-config.h"
 #include "strv.h"
 #include "tests.h"
-#include "util.h"
 
 TEST(parse_sleep_config) {
         _cleanup_(free_sleep_configp) SleepConfig *sleep_config = NULL;

diff --git a/src/test/test-strbuf.c b/src/test/test-strbuf.c
index 9233c63f90a4da508e3871749055df8f79074689..5c12a0597ad29321793e734761356371b315a813 100644 (file)
--- a/src/test/test-strbuf.c
+++ b/src/test/test-strbuf.c
@@ -6,7 +6,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "tests.h"
-#include "util.h"
 
 static ssize_t add_string(struct strbuf *sb, const char *s) {
         return strbuf_add_string(sb, s, strlen(s));

diff --git a/src/test/test-string-util.c b/src/test/test-string-util.c
index d0a2272794c733486ed12c8d0fb83792f58c1ecd..4047139c269a1881b11659d150eb6954b5701c18 100644 (file)
--- a/src/test/test-string-util.c
+++ b/src/test/test-string-util.c
@@ -9,7 +9,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "utf8.h"
-#include "util.h"
 
 TEST(string_erase) {
         char *x;

diff --git a/src/test/test-strip-tab-ansi.c b/src/test/test-strip-tab-ansi.c
index 5152cf2cf8606abd862fd15268e199257e3efd1a..6f73d2686de58354b828a7b6042dedacca431477 100644 (file)
--- a/src/test/test-strip-tab-ansi.c
+++ b/src/test/test-strip-tab-ansi.c
@@ -7,7 +7,6 @@
 #include "string-util.h"
 #include "terminal-util.h"
 #include "tests.h"
-#include "util.h"
 
 TEST(strip_tab_ansi) {
         _cleanup_free_ char *urlified = NULL, *q = NULL, *qq = NULL;

diff --git a/src/test/test-strxcpyx.c b/src/test/test-strxcpyx.c
index dd8dbdea613c7660936fc26853931d7cdbccf622..b679522fc620c6293d9ee85fa573a23c11024d7f 100644 (file)
--- a/src/test/test-strxcpyx.c
+++ b/src/test/test-strxcpyx.c
@@ -5,7 +5,6 @@
 #include "string-util.h"
 #include "strxcpyx.h"
 #include "tests.h"
-#include "util.h"
 
 TEST(strpcpy) {
         char target[25];

diff --git a/src/test/test-tables.c b/src/test/test-tables.c
index 30ca1871cb95635b856bfe8c86ddee621e850c81..6301dedb09e064f0c1c181fa852d95d88b258b5f 100644 (file)
--- a/src/test/test-tables.c
+++ b/src/test/test-tables.c
@@ -36,7 +36,6 @@
 #include "timer.h"
 #include "unit-name.h"
 #include "unit.h"
-#include "util.h"
 #include "virt.h"
 
 int main(int argc, char **argv) {

diff --git a/src/test/test-terminal-util.c b/src/test/test-terminal-util.c
index 292e5348bcca1649b54c2d634f53cab1748cae9b..8d0e45203827756599963a16c583de083016ad03 100644 (file)
--- a/src/test/test-terminal-util.c
+++ b/src/test/test-terminal-util.c
@@ -14,7 +14,6 @@
 #include "terminal-util.h"
 #include "tests.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 #define LOREM_IPSUM "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor " \
         "incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation " \

diff --git a/src/test/test-tmpfiles.c b/src/test/test-tmpfiles.c
index f26701767f3bf951e6ba1232ae1c883bebc46422..c58ac933bbf2b9d9994fe122e469c8e788e0021d 100644 (file)
--- a/src/test/test-tmpfiles.c
+++ b/src/test/test-tmpfiles.c
@@ -15,7 +15,6 @@
 #include "string-util.h"
 #include "tests.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 TEST(tmpfiles) {
         _cleanup_free_ char *cmd = NULL, *cmd2 = NULL, *ans = NULL, *ans2 = NULL, *d = NULL, *tmp = NULL, *line = NULL;

diff --git a/src/test/test-uid-range.c b/src/test/test-uid-range.c
index ce8b8e4bcafb3425b45ac6ffc0dde73a2144c61e..c75957317391195db6391459dfe8a23668c1a700 100644 (file)
--- a/src/test/test-uid-range.c
+++ b/src/test/test-uid-range.c
@@ -11,7 +11,6 @@
 #include "tmpfile-util.h"
 #include "uid-range.h"
 #include "user-util.h"
-#include "util.h"
 #include "virt.h"
 
 TEST(uid_range) {

diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index 43fdb15d1cc7797945c5ca92bf5aa2dca2e8b2f1..98fffc7c87e4fb12f86b1b022d71eb52c823dffa 100644 (file)
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -22,7 +22,6 @@
 #include "unit-printf.h"
 #include "unit.h"
 #include "user-util.h"
-#include "util.h"
 
 static char *runtime_dir = NULL;
 

diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c
index f070c171fe4a5d0f2faca0df2c141e6f35bee8ad..7ba0cb7dd233b6d8349b83d2baf292732b6c0885 100644 (file)
--- a/src/test/test-utf8.c
+++ b/src/test/test-utf8.c
@@ -5,7 +5,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "utf8.h"
-#include "util.h"
 
 TEST(utf8_is_printable) {
         assert_se(utf8_is_printable("ascii is valid\tunicode", 22));

diff --git a/src/test/test-xml.c b/src/test/test-xml.c
index e69d6d0fe4bc25e7655f3d7c0777d4d45398f7b0..5dee5c1beda043801df3af121561eb187a44d906 100644 (file)
--- a/src/test/test-xml.c
+++ b/src/test/test-xml.c
@@ -4,7 +4,6 @@
 
 #include "alloc-util.h"
 #include "string-util.h"
-#include "util.h"
 #include "xml.h"
 
 static void test_one(const char *data, ...) {

diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index e9fa00aacab8c180ef0fe220ef6241e51af6f948..da540856ee93e360fa17ffa23ed9c970df9188a3 100644 (file)
--- a/src/timesync/timesyncd-manager.c
+++ b/src/timesync/timesyncd-manager.c
@@ -22,6 +22,7 @@
 #include "fs-util.h"
 #include "list.h"
 #include "log.h"
+#include "logarithm.h"
 #include "network-util.h"
 #include "ratelimit.h"
 #include "resolve-private.h"
@@ -32,7 +33,6 @@
 #include "timesyncd-conf.h"
 #include "timesyncd-manager.h"
 #include "user-util.h"
-#include "util.h"
 
 #ifndef ADJ_SETOFFSET
 #define ADJ_SETOFFSET                   0x0100  /* add 'time' to current time */

diff --git a/src/udev/test-udev-event.c b/src/udev/test-udev-event.c
index b6b2c91b2e99b2d055c5c7ad56980fed49f2b105..42f435916bd64916db656ddc76d2fc9a6dee3130 100644 (file)
--- a/src/udev/test-udev-event.c
+++ b/src/udev/test-udev-event.c
@@ -5,7 +5,6 @@
 #include "strv.h"
 #include "tests.h"
 #include "udev-event.h"
-#include "util.h"
 
 #define BUF_SIZE 1024
 

diff --git a/src/udev/udev-builtin-btrfs.c b/src/udev/udev-builtin-btrfs.c
index 8cd627807f9667e5d7aaea07652a0a9a6b72d0b0..faaafb23f665958eb8ec5f7a16e31e7c2e565830 100644 (file)
--- a/src/udev/udev-builtin-btrfs.c
+++ b/src/udev/udev-builtin-btrfs.c
@@ -11,7 +11,6 @@
 #include "string-util.h"
 #include "strxcpyx.h"
 #include "udev-builtin.h"
-#include "util.h"
 
 static int builtin_btrfs(sd_device *dev, sd_netlink **rtnl, int argc, char *argv[], bool test) {
         struct btrfs_ioctl_vol_args args = {};

diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c
index 07421202483e4aeb50b84aeafb8ee38f22c6f8ae..465913ce31f9f850978b1d14c261c2aded1d03eb 100644 (file)
--- a/src/udev/udev-builtin-input_id.c
+++ b/src/udev/udev-builtin-input_id.c
@@ -19,7 +19,6 @@
 #include "stdio-util.h"
 #include "string-util.h"
 #include "udev-builtin.h"
-#include "util.h"
 
 /* we must use this kernel-compatible implementation */
 #define BITS_PER_LONG (sizeof(unsigned long) * 8)

diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index c8b773611f902b9c965a42917bc3a7409c8575bd..625c4faad83813a826e14efb588aeb09aa7db71e 100644 (file)
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -18,7 +18,6 @@
 #include "socket-util.h"
 #include "strxcpyx.h"
 #include "udev-ctrl.h"
-#include "util.h"
 
 /* wire protocol magic must match */
 #define UDEV_CTRL_MAGIC                                0xdead1dea

diff --git a/src/udev/udev-event.h b/src/udev/udev-event.h
index 6d823331aa1ad85f8409295c1563fc48b22eada0..c54c7891b61e094e21693c9efd352bcd807c9058 100644 (file)
--- a/src/udev/udev-event.h
+++ b/src/udev/udev-event.h
@@ -12,7 +12,6 @@
 #include "macro.h"
 #include "udev-rules.h"
 #include "udev-util.h"
-#include "util.h"
 
 #define READ_END  0
 #define WRITE_END 1

diff --git a/src/udev/udevadm-control.c b/src/udev/udevadm-control.c
index 06c61e5c07c68bdd9dcdd7bce0ed143e8919afc5..8dc3a8d955a900ed8d6e8b8bb68884c1dc1cd39b 100644 (file)
--- a/src/udev/udevadm-control.c
+++ b/src/udev/udevadm-control.c
@@ -25,7 +25,6 @@
 #include "time-util.h"
 #include "udevadm.h"
 #include "udev-ctrl.h"
-#include "util.h"
 #include "virt.h"
 
 static int help(void) {

diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
index 972cda129df420c73c4750fc82a9fe954a5434ac..a4468cf24f0e45ba2d10cf43b1fabaad750535fd 100644 (file)
--- a/src/udev/udevadm-hwdb.c
+++ b/src/udev/udevadm-hwdb.c
@@ -4,7 +4,6 @@
 
 #include "hwdb-util.h"
 #include "udevadm.h"
-#include "util.h"
 
 static const char *arg_test = NULL;
 static const char *arg_root = NULL;

diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c
index cd3786b416da6b9af25a66893a01ba3b9a871ff5..b742c1a28730deda43e6ba07e68dd1d29013a485 100644 (file)
--- a/src/udev/udevadm.c
+++ b/src/udev/udevadm.c
@@ -14,7 +14,6 @@
 #include "udev-util.h"
 #include "udevadm.h"
 #include "udevd.h"
-#include "util.h"
 #include "verbs.h"
 
 static int help(void) {

diff --git a/src/udev/v4l_id/v4l_id.c b/src/udev/v4l_id/v4l_id.c
index c2312c790998d9f669d31acf3dabd32281722ae2..13b4839989f919842c1f414e4d4fc6e1568c765f 100644 (file)
--- a/src/udev/v4l_id/v4l_id.c
+++ b/src/udev/v4l_id/v4l_id.c
@@ -27,7 +27,6 @@
 #include <linux/videodev2.h>
 
 #include "fd-util.h"
-#include "util.h"
 
 int main(int argc, char *argv[]) {
         static const struct option options[] = {

diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
index 0995e3557ebef867cce9ab5b3d03416470839e53..675526f3ace066cc11bc0dd7c2ee6afd7c3f3940 100644 (file)
--- a/src/update-utmp/update-utmp.c
+++ b/src/update-utmp/update-utmp.c
@@ -23,7 +23,6 @@
 #include "stdio-util.h"
 #include "strv.h"
 #include "unit-name.h"
-#include "util.h"
 #include "utmp-wtmp.h"
 
 typedef struct Context {

diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index cdf28ac6aca4e06c6b4f8d804da5499a3888b358..98f978df0af0208ca2d6927ebf7d22391623a6cf 100644 (file)
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -33,7 +33,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
-#include "util.h"
 #include "virt.h"
 
 static int verify_vc_device(int fd) {