util: split out memcmp()/memset() related calls into memory-util.[ch]

Just some source rearranging.

src/basic/alloc-util.c

@@ -5,7 +5,7 @@
 
 #include "alloc-util.h"
 #include "macro.h"
-#include "util.h"
+#include "memory-util.h"
 
 void* memdup(const void *p, size_t l) {
         void *ret;

src/basic/hashmap.c

@@ -9,6 +9,7 @@
 #include "fileio.h"
 #include "hashmap.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "mempool.h"
 #include "process-util.h"
 #include "random-util.h"
@@ -16,7 +17,6 @@
 #include "siphash24.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 
 #if ENABLE_DEBUG_HASHMAP
 #include <pthread.h>

src/basic/hexdecoct.c

@@ -8,8 +8,8 @@
 #include "alloc-util.h"
 #include "hexdecoct.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "string-util.h"
-#include "util.h"
 
 char octchar(int x) {
         return '0' + (x & 7);

src/basic/limits-util.c

@@ -3,6 +3,7 @@
 #include "alloc-util.h"
 #include "cgroup-util.h"
 #include "limits-util.h"
+#include "memory-util.h"
 #include "parse-util.h"
 #include "process-util.h"
 #include "procfs-util.h"

src/basic/memory-util.c

@@ -0,0 +1,39 @@
+#include <unistd.h>
+
+#include "memory-util.h"
+
+size_t page_size(void) {
+        static thread_local size_t pgsz = 0;
+        long r;
+
+        if (_likely_(pgsz > 0))
+                return pgsz;
+
+        r = sysconf(_SC_PAGESIZE);
+        assert(r > 0);
+
+        pgsz = (size_t) r;
+        return pgsz;
+}
+
+bool memeqzero(const void *data, size_t length) {
+        /* Does the buffer consist entirely of NULs?
+         * Copied from https://github.com/systemd/casync/, copied in turn from
+         * https://github.com/rustyrussell/ccan/blob/master/ccan/mem/mem.c#L92,
+         * which is licensed CC-0.
+         */
+
+        const uint8_t *p = data;
+        size_t i;
+
+        /* Check first 16 bytes manually */
+        for (i = 0; i < 16; i++, length--) {
+                if (length == 0)
+                        return true;
+                if (p[i])
+                        return false;
+        }
+
+        /* Now we know first 16 bytes are NUL, memcmp with self.  */
+        return memcmp(data, p + i, length) == 0;
+}

src/basic/memory-util.h

@@ -0,0 +1,53 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+#pragma once
+
+#include <inttypes.h>
+#include <stdbool.h>
+#include <string.h>
+#include <sys/types.h>
+
+#include "macro.h"
+
+size_t page_size(void) _pure_;
+#define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
+
+/* Normal memcpy requires src to be nonnull. We do nothing if n is 0. */
+static inline void memcpy_safe(void *dst, const void *src, size_t n) {
+        if (n == 0)
+                return;
+        assert(src);
+        memcpy(dst, src, n);
+}
+
+/* Normal memcmp requires s1 and s2 to be nonnull. We do nothing if n is 0. */
+static inline int memcmp_safe(const void *s1, const void *s2, size_t n) {
+        if (n == 0)
+                return 0;
+        assert(s1);
+        assert(s2);
+        return memcmp(s1, s2, n);
+}
+
+/* Compare s1 (length n1) with s2 (length n2) in lexicographic order. */
+static inline int memcmp_nn(const void *s1, size_t n1, const void *s2, size_t n2) {
+        return memcmp_safe(s1, s2, MIN(n1, n2))
+            ?: CMP(n1, n2);
+}
+
+#define memzero(x,l)                                            \
+        ({                                                      \
+                size_t _l_ = (l);                               \
+                void *_x_ = (x);                                \
+                _l_ == 0 ? _x_ : memset(_x_, 0, _l_);           \
+        })
+
+#define zero(x) (memzero(&(x), sizeof(x)))
+
+bool memeqzero(const void *data, size_t length);
+
+#define eqzero(x) memeqzero(x, sizeof(x))
+
+static inline void *mempset(void *s, int c, size_t n) {
+        memset(s, c, n);
+        return (uint8_t*)s + n;
+}

src/basic/mempool.c

@@ -5,6 +5,7 @@
 
 #include "env-util.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "mempool.h"
 #include "process-util.h"
 #include "util.h"

src/basic/meson.build

@@ -91,6 +91,8 @@ basic_sources = files('''
         macro.h
         memfd-util.c
         memfd-util.h
+        memory-util.c
+        memory-util.h
         mempool.c
         mempool.h
         missing.h

src/basic/process-util.c

@@ -32,6 +32,7 @@
 #include "ioprio.h"
 #include "log.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "missing.h"
 #include "namespace-util.h"
 #include "process-util.h"
@@ -43,7 +44,6 @@
 #include "string-util.h"
 #include "terminal-util.h"
 #include "user-util.h"
-#include "util.h"
 
 int get_process_state(pid_t pid) {
         const char *p;

src/basic/sigbus.c

@@ -6,8 +6,8 @@
 #include <sys/mman.h>
 
 #include "macro.h"
+#include "memory-util.h"
 #include "sigbus.h"
-#include "util.h"
 
 #define SIGBUS_QUEUE_MAX 64
 

src/basic/socket-util.c

@@ -21,6 +21,7 @@
 #include "format-util.h"
 #include "log.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "missing.h"
 #include "parse-util.h"
 #include "path-util.h"
@@ -31,7 +32,6 @@
 #include "strv.h"
 #include "user-util.h"
 #include "utf8.h"
-#include "util.h"
 
 #if ENABLE_IDN
 #  define IDN_FLAGS NI_IDN

src/basic/stdio-util.h

@@ -7,7 +7,7 @@
 #include <sys/types.h>
 
 #include "macro.h"
-#include "util.h"
+#include "memory-util.h"
 
 #define snprintf_ok(buf, len, fmt, ...) \
         ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len))

src/basic/util.c

@@ -51,20 +51,6 @@ int saved_argc = 0;
 char **saved_argv = NULL;
 static int saved_in_initrd = -1;
 
-size_t page_size(void) {
-        static thread_local size_t pgsz = 0;
-        long r;
-
-        if (_likely_(pgsz > 0))
-                return pgsz;
-
-        r = sysconf(_SC_PAGESIZE);
-        assert(r > 0);
-
-        pgsz = (size_t) r;
-        return pgsz;
-}
-
 bool plymouth_running(void) {
         return access("/run/plymouth/pid", F_OK) >= 0;
 }
@@ -165,28 +151,6 @@ void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
         return NULL;
 }
 
-bool memeqzero(const void *data, size_t length) {
-        /* Does the buffer consist entirely of NULs?
-         * Copied from https://github.com/systemd/casync/, copied in turn from
-         * https://github.com/rustyrussell/ccan/blob/master/ccan/mem/mem.c#L92,
-         * which is licensed CC-0.
-         */
-
-        const uint8_t *p = data;
-        size_t i;
-
-        /* Check first 16 bytes manually */
-        for (i = 0; i < 16; i++, length--) {
-                if (length == 0)
-                        return true;
-                if (p[i])
-                        return false;
-        }
-
-        /* Now we know first 16 bytes are NUL, memcmp with self.  */
-        return memcmp(data, p + i, length) == 0;
-}
-
 int on_ac_power(void) {
         bool found_offline = false, found_online = false;
         _cleanup_closedir_ DIR *d = NULL;

src/basic/util.h

@@ -27,9 +27,6 @@
 #include "macro.h"
 #include "time-util.h"
 
-size_t page_size(void) _pure_;
-#define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
-
 static inline const char* yes_no(bool b) {
         return b ? "yes" : "no";
 }
@@ -130,49 +127,8 @@ static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_
                 qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \
         })
 
-/* Normal memcpy requires src to be nonnull. We do nothing if n is 0. */
-static inline void memcpy_safe(void *dst, const void *src, size_t n) {
-        if (n == 0)
-                return;
-        assert(src);
-        memcpy(dst, src, n);
-}
-
-/* Normal memcmp requires s1 and s2 to be nonnull. We do nothing if n is 0. */
-static inline int memcmp_safe(const void *s1, const void *s2, size_t n) {
-        if (n == 0)
-                return 0;
-        assert(s1);
-        assert(s2);
-        return memcmp(s1, s2, n);
-}
-
-/* Compare s1 (length n1) with s2 (length n2) in lexicographic order. */
-static inline int memcmp_nn(const void *s1, size_t n1, const void *s2, size_t n2) {
-        return memcmp_safe(s1, s2, MIN(n1, n2))
-            ?: CMP(n1, n2);
-}
-
 int on_ac_power(void);
 
-#define memzero(x,l)                                            \
-        ({                                                      \
-                size_t _l_ = (l);                               \
-                void *_x_ = (x);                                \
-                _l_ == 0 ? _x_ : memset(_x_, 0, _l_);           \
-        })
-
-#define zero(x) (memzero(&(x), sizeof(x)))
-
-bool memeqzero(const void *data, size_t length);
-
-#define eqzero(x) memeqzero(x, sizeof(x))
-
-static inline void *mempset(void *s, int c, size_t n) {
-        memset(s, c, n);
-        return (uint8_t*)s + n;
-}
-
 static inline void _reset_errno_(int *saved_errno) {
         if (*saved_errno < 0) /* Invalidated by UNPROTECT_ERRNO? */
                 return;

src/core/bpf-firewall.c

@@ -20,6 +20,7 @@
 #include "bpf-program.h"
 #include "fd-util.h"
 #include "ip-address-access.h"
+#include "memory-util.h"
 #include "missing_syscall.h"
 #include "unit.h"
 

src/core/execute.c

@@ -65,6 +65,7 @@
 #include "log.h"
 #include "macro.h"
 #include "manager.h"
+#include "memory-util.h"
 #include "missing.h"
 #include "mkdir.h"
 #include "namespace.h"
@@ -91,7 +92,6 @@
 #include "umask-util.h"
 #include "unit.h"
 #include "user-util.h"
-#include "util.h"
 #include "utmp-wtmp.h"
 
 #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC)

src/core/manager.c

@@ -52,6 +52,7 @@
 #include "log.h"
 #include "macro.h"
 #include "manager.h"
+#include "memory-util.h"
 #include "missing.h"
 #include "mkdir.h"
 #include "parse-util.h"
@@ -77,7 +78,6 @@
 #include "umask-util.h"
 #include "unit-name.h"
 #include "user-util.h"
-#include "util.h"
 #include "virt.h"
 #include "watchdog.h"
 

src/coredump/coredump-vacuum.c

@@ -9,10 +9,10 @@
 #include "fs-util.h"
 #include "hashmap.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "string-util.h"
 #include "time-util.h"
 #include "user-util.h"
-#include "util.h"
 
 #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL)           /* 1 MiB */
 #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL)   /* 4 GiB */

src/coredump/coredump.c

@@ -35,6 +35,7 @@
 #include "log.h"
 #include "macro.h"
 #include "main-func.h"
+#include "memory-util.h"
 #include "missing.h"
 #include "mkdir.h"
 #include "parse-util.h"
@@ -48,7 +49,6 @@
 #include "strv.h"
 #include "tmpfile-util.h"
 #include "user-util.h"
-#include "util.h"
 
 /* The maximum size up to which we process coredumps */
 #define PROCESS_SIZE_MAX ((uint64_t) (2LLU*1024LLU*1024LLU*1024LLU))

src/fuzz/fuzz-dns-packet.c

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include "fuzz.h"
+#include "memory-util.h"
 #include "resolved-dns-packet.h"
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {

src/initctl/initctl.c

@@ -18,9 +18,9 @@
 #include "initreq.h"
 #include "list.h"
 #include "log.h"
-#include "special.h"
-#include "util.h"
+#include "memory-util.h"
 #include "process-util.h"
+#include "special.h"
 
 #define SERVER_FD_MAX 16
 #define TIMEOUT_MSEC ((int) (DEFAULT_EXIT_USEC/USEC_PER_MSEC))

src/journal/catalog.c

@@ -17,6 +17,7 @@
 #include "fileio.h"
 #include "hashmap.h"
 #include "log.h"
+#include "memory-util.h"
 #include "mkdir.h"
 #include "path-util.h"
 #include "siphash24.h"
@@ -25,7 +26,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 const char * const catalog_file_dirs[] = {
         "/usr/local/lib/systemd/catalog/",

src/journal/fsprg.c

@@ -32,6 +32,7 @@
 
 #include "fsprg.h"
 #include "gcrypt-util.h"
+#include "memory-util.h"
 
 #define ISVALID_SECPAR(secpar) (((secpar) % 16 == 0) && ((secpar) >= 16) && ((secpar) <= 16384))
 #define VALIDATE_SECPAR(secpar) assert(ISVALID_SECPAR(secpar));

src/journal/journal-authenticate.c

@@ -10,6 +10,7 @@
 #include "journal-authenticate.h"
 #include "journal-def.h"
 #include "journal-file.h"
+#include "memory-util.h"
 
 static uint64_t journal_file_tag_seqnum(JournalFile *f) {
         uint64_t r;

src/journal/journal-file.c

@@ -22,6 +22,7 @@
 #include "journal-def.h"
 #include "journal-file.h"
 #include "lookup3.h"
+#include "memory-util.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "random-util.h"

src/journal/journalctl.c

@@ -50,6 +50,7 @@
 #include "locale-util.h"
 #include "log.h"
 #include "logs-show.h"
+#include "memory-util.h"
 #include "mkdir.h"
 #include "pager.h"
 #include "parse-util.h"

src/journal/journald-native.c

@@ -19,6 +19,7 @@
 #include "journald-syslog.h"
 #include "journald-wall.h"
 #include "memfd-util.h"
+#include "memory-util.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"

src/journal/mmap-cache.c

@@ -10,9 +10,9 @@
 #include "list.h"
 #include "log.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "mmap-cache.h"
 #include "sigbus.h"
-#include "util.h"
 
 typedef struct Window Window;
 typedef struct Context Context;

src/journal/test-compress-benchmark.c

@@ -4,6 +4,7 @@
 #include "compress.h"
 #include "env-util.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "parse-util.h"
 #include "process-util.h"
 #include "random-util.h"

src/journal/test-compress.c

@@ -9,11 +9,11 @@
 #include "fd-util.h"
 #include "fs-util.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "path-util.h"
 #include "random-util.h"
 #include "tests.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 #if HAVE_XZ
 # define XZ_OK 0

src/libsystemd-network/dhcp-option.c

@@ -9,10 +9,10 @@
 #include <string.h>
 
 #include "alloc-util.h"
-#include "utf8.h"
-#include "strv.h"
-
 #include "dhcp-internal.h"
+#include "memory-util.h"
+#include "strv.h"
+#include "utf8.h"
 
 static int option_append(uint8_t options[], size_t size, size_t *offset,
                          uint8_t code, size_t optlen, const void *optval) {

src/libsystemd-network/dhcp6-option.c

@@ -14,10 +14,10 @@
 #include "dhcp6-lease-internal.h"
 #include "dhcp6-protocol.h"
 #include "dns-domain.h"
+#include "memory-util.h"
 #include "sparse-endian.h"
 #include "strv.h"
 #include "unaligned.h"
-#include "util.h"
 
 typedef struct DHCP6StatusOption {
         struct DHCP6Option option;

src/libsystemd-network/lldp-neighbor.c

@@ -7,9 +7,9 @@
 #include "in-addr-util.h"
 #include "lldp-internal.h"
 #include "lldp-neighbor.h"
+#include "memory-util.h"
 #include "missing.h"
 #include "unaligned.h"
-#include "util.h"
 
 static void lldp_neighbor_id_hash_func(const LLDPNeighborID *id, struct siphash *state) {
         siphash24_compress(id->chassis_id, id->chassis_id_size, state);

src/libsystemd-network/ndisc-router.c

@@ -10,6 +10,7 @@
 #include "alloc-util.h"
 #include "dns-domain.h"
 #include "hostname-util.h"
+#include "memory-util.h"
 #include "missing.h"
 #include "ndisc-internal.h"
 #include "ndisc-router.h"

src/libsystemd-network/sd-dhcp-client.c

@@ -24,10 +24,10 @@
 #include "event-util.h"
 #include "hostname-util.h"
 #include "io-util.h"
+#include "memory-util.h"
 #include "random-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 
 #define MAX_CLIENT_ID_LEN (sizeof(uint32_t) + MAX_DUID_LEN)  /* Arbitrary limit */
 #define MAX_MAC_ADDR_LEN CONST_MAX(INFINIBAND_ALEN, ETH_ALEN)

src/libsystemd-network/sd-lldp.c

@@ -13,6 +13,7 @@
 #include "lldp-internal.h"
 #include "lldp-neighbor.h"
 #include "lldp-network.h"
+#include "memory-util.h"
 #include "socket-util.h"
 #include "string-table.h"
 

src/libsystemd-network/sd-ndisc.c

@@ -13,13 +13,13 @@
 #include "fd-util.h"
 #include "icmp6-util.h"
 #include "in-addr-util.h"
+#include "memory-util.h"
 #include "ndisc-internal.h"
 #include "ndisc-router.h"
 #include "random-util.h"
 #include "socket-util.h"
 #include "string-table.h"
 #include "string-util.h"
-#include "util.h"
 
 #define NDISC_TIMEOUT_NO_RA_USEC (NDISC_ROUTER_SOLICITATION_INTERVAL * NDISC_MAX_ROUTER_SOLICITATIONS)
 

src/libsystemd-network/sd-radv.c

@@ -18,12 +18,12 @@
 #include "in-addr-util.h"
 #include "io-util.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "radv-internal.h"
 #include "random-util.h"
 #include "socket-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 
 _public_ int sd_radv_new(sd_radv **ret) {
         _cleanup_(sd_radv_unrefp) sd_radv *ra = NULL;

src/libsystemd-network/test-dhcp-option.c

@@ -7,7 +7,7 @@
 #include "dhcp-internal.h"
 #include "dhcp-protocol.h"
 #include "macro.h"
-#include "util.h"
+#include "memory-util.h"
 
 struct option_desc {
         uint8_t sname[64];

src/libsystemd-network/test-dhcp6-client.c

@@ -18,9 +18,10 @@
 #include "dhcp6-protocol.h"
 #include "fd-util.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "socket-util.h"
 #include "tests.h"
-#include "util.h"
+#include "time-util.h"
 #include "virt.h"
 
 static struct ether_addr mac_addr = {

src/libsystemd/sd-bus/bus-introspect.c

@@ -9,8 +9,8 @@
 #include "bus-signature.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "memory-util.h"
 #include "string-util.h"
-#include "util.h"
 
 int introspect_begin(struct introspect *i, bool trusted) {
         assert(i);

src/libsystemd/sd-bus/bus-kernel.c

@@ -31,7 +31,7 @@
 #include "string-util.h"
 #include "strv.h"
 #include "user-util.h"
-#include "util.h"
+#include "memory-util.h"
 
 void close_and_munmap(int fd, void *address, size_t size) {
         if (size > 0)

src/libsystemd/sd-bus/bus-message.c

@@ -16,11 +16,11 @@
 #include "fd-util.h"
 #include "io-util.h"
 #include "memfd-util.h"
+#include "memory-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "time-util.h"
 #include "utf8.h"
-#include "util.h"
 
 static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored);
 

src/libsystemd/sd-bus/bus-socket.c

@@ -18,6 +18,7 @@
 #include "hexdecoct.h"
 #include "io-util.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "missing.h"
 #include "path-util.h"
 #include "process-util.h"
@@ -28,7 +29,6 @@
 #include "string-util.h"
 #include "user-util.h"
 #include "utf8.h"
-#include "util.h"
 
 #define SNDBUF_SIZE (8*1024*1024)
 

src/libsystemd/sd-bus/sd-bus.c

@@ -32,12 +32,12 @@
 #include "hexdecoct.h"
 #include "hostname-util.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "missing.h"
 #include "parse-util.h"
 #include "process-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 
 #define log_debug_bus_message(m)                                         \
         do {                                                             \

src/libsystemd/sd-bus/test-bus-match.c

@@ -6,6 +6,7 @@
 #include "bus-util.h"
 #include "log.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "tests.h"
 
 static bool mask[32];

src/libsystemd/sd-bus/test-bus-server.c

@@ -9,7 +9,7 @@
 #include "bus-util.h"
 #include "log.h"
 #include "macro.h"
-#include "util.h"
+#include "memory-util.h"
 
 struct context {
         int fds[2];

src/libsystemd/sd-event/sd-event.c

@@ -15,6 +15,7 @@
 #include "hashmap.h"
 #include "list.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "missing.h"
 #include "prioq.h"
 #include "process-util.h"
@@ -23,7 +24,6 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "time-util.h"
-#include "util.h"
 
 #define DEFAULT_ACCURACY_USEC (250 * USEC_PER_MSEC)
 

src/libsystemd/sd-netlink/netlink-message.c

@@ -13,7 +13,7 @@
 #include "netlink-types.h"
 #include "netlink-util.h"
 #include "socket-util.h"
-#include "util.h"
+#include "memory-util.h"
 
 #define GET_CONTAINER(m, i) ((i) < (m)->n_containers ? (struct rtattr*)((uint8_t*)(m)->hdr + (m)->containers[i].offset) : NULL)
 #define PUSH_CONTAINER(m, new) (m)->container_offsets[(m)->n_containers++] = (uint8_t*)(new) - (uint8_t*)(m)->hdr;

src/libsystemd/sd-resolve/sd-resolve.c

@@ -19,11 +19,11 @@
 #include "fd-util.h"
 #include "io-util.h"
 #include "list.h"
+#include "memory-util.h"
 #include "missing.h"
+#include "process-util.h"
 #include "resolve-private.h"
 #include "socket-util.h"
-#include "util.h"
-#include "process-util.h"
 
 #define WORKERS_MIN 1U
 #define WORKERS_MAX 16U

src/libudev/libudev-list.c

@@ -7,7 +7,7 @@
 
 #include "alloc-util.h"
 #include "libudev-list-internal.h"
-#include "util.h"
+#include "memory-util.h"
 
 /**
  * SECTION:libudev-list

src/locale/localectl.c

@@ -16,13 +16,13 @@
 #include "fileio.h"
 #include "locale-util.h"
 #include "main-func.h"
+#include "memory-util.h"
 #include "pager.h"
 #include "pretty-print.h"
 #include "proc-cmdline.h"
 #include "set.h"
 #include "spawn-polkit-agent.h"
 #include "strv.h"
-#include "util.h"
 #include "verbs.h"
 #include "virt.h"
 

src/login/loginctl.c

@@ -19,6 +19,7 @@
 #include "logs-show.h"
 #include "macro.h"
 #include "main-func.h"
+#include "memory-util.h"
 #include "pager.h"
 #include "parse-util.h"
 #include "pretty-print.h"
@@ -33,7 +34,6 @@
 #include "terminal-util.h"
 #include "unit-name.h"
 #include "user-util.h"
-#include "util.h"
 #include "verbs.h"
 
 static char **arg_property = NULL;

src/network/netdev/wireguard.c

@@ -13,6 +13,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "hexdecoct.h"
+#include "memory-util.h"
 #include "netlink-util.h"
 #include "networkd-link.h"
 #include "networkd-manager.h"
@@ -22,8 +23,8 @@
 #include "resolve-private.h"
 #include "string-util.h"
 #include "strv.h"
-#include "wireguard.h"
 #include "wireguard-netlink.h"
+#include "wireguard.h"
 
 static void resolve_endpoints(NetDev *netdev);
 

src/network/networkd-address.c

@@ -5,6 +5,7 @@
 #include "alloc-util.h"
 #include "conf-parser.h"
 #include "firewall-util.h"
+#include "memory-util.h"
 #include "missing_network.h"
 #include "netlink-util.h"
 #include "networkd-address.h"
@@ -15,7 +16,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "utf8.h"
-#include "util.h"
 
 #define ADDRESSES_PER_LINK_MAX 2048U
 #define STATIC_ADDRESSES_PER_NETWORK_MAX 1024U

src/nss-mymachines/nss-mymachines.c

@@ -12,11 +12,11 @@
 #include "hostname-util.h"
 #include "in-addr-util.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "nss-util.h"
 #include "signal-util.h"
 #include "string-util.h"
 #include "user-util.h"
-#include "util.h"
 
 NSS_GETHOSTBYNAME_PROTOTYPES(mymachines);
 NSS_GETPW_PROTOTYPES(mymachines);

src/resolve/resolved-bus.c

@@ -4,12 +4,13 @@
 #include "bus-common-errors.h"
 #include "bus-util.h"
 #include "dns-domain.h"
+#include "memory-util.h"
 #include "missing_capability.h"
 #include "resolved-bus.h"
 #include "resolved-def.h"
 #include "resolved-dns-synthesize.h"
-#include "resolved-dnssd.h"
 #include "resolved-dnssd-bus.h"
+#include "resolved-dnssd.h"
 #include "resolved-link-bus.h"
 #include "user-util.h"
 #include "utf8.h"

src/resolve/resolved-dns-dnssec.c

@@ -12,6 +12,7 @@
 #include "fileio.h"
 #include "gcrypt-util.h"
 #include "hexdecoct.h"
+#include "memory-util.h"
 #include "resolved-dns-dnssec.h"
 #include "resolved-dns-packet.h"
 #include "string-table.h"

src/resolve/resolved-dns-packet.c

@@ -6,6 +6,7 @@
 
 #include "alloc-util.h"
 #include "dns-domain.h"
+#include "memory-util.h"
 #include "resolved-dns-packet.h"
 #include "set.h"
 #include "string-table.h"

src/shared/ask-password-api.c

@@ -31,6 +31,7 @@
 #include "io-util.h"
 #include "log.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "missing.h"
 #include "mkdir.h"
 #include "process-util.h"
@@ -44,7 +45,6 @@
 #include "tmpfile-util.h"
 #include "umask-util.h"
 #include "utf8.h"
-#include "util.h"
 
 #define KEYRING_TIMEOUT_USEC ((5 * USEC_PER_MINUTE) / 2)
 

src/shared/bitmap.c

@@ -10,6 +10,7 @@
 #include "bitmap.h"
 #include "hashmap.h"
 #include "macro.h"
+#include "memory-util.h"
 
 struct Bitmap {
         uint64_t *bitmaps;

src/shared/bpf-program.c

@@ -9,9 +9,9 @@
 #include "bpf-program.h"
 #include "fd-util.h"
 #include "log.h"
+#include "memory-util.h"
 #include "missing.h"
 #include "path-util.h"
-#include "util.h"
 
 int bpf_program_new(uint32_t prog_type, BPFProgram **ret) {
         _cleanup_(bpf_program_unrefp) BPFProgram *p = NULL;

src/shared/format-table.c

@@ -8,6 +8,7 @@
 #include "fileio.h"
 #include "format-table.h"
 #include "gunicode.h"
+#include "memory-util.h"
 #include "pager.h"
 #include "parse-util.h"
 #include "pretty-print.h"
@@ -15,7 +16,6 @@
 #include "terminal-util.h"
 #include "time-util.h"
 #include "utf8.h"
-#include "util.h"
 
 #define DEFAULT_WEIGHT 100
 

src/shared/json.c

@@ -18,6 +18,7 @@
 #include "json-internal.h"
 #include "json.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"

src/shared/utmp-wtmp.c

@@ -16,12 +16,12 @@
 #include "fd-util.h"
 #include "hostname-util.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "path-util.h"
 #include "string-util.h"
 #include "terminal-util.h"
 #include "time-util.h"
 #include "user-util.h"
-#include "util.h"
 #include "utmp-wtmp.h"
 
 int utmp_get_runlevel(int *runlevel, int *previous) {

src/systemctl/systemctl.c

@@ -40,9 +40,9 @@
 #include "glob-util.h"
 #include "hexdecoct.h"
 #include "hostname-util.h"
+#include "in-addr-util.h"
 #include "initreq.h"
 #include "install.h"
-#include "in-addr-util.h"
 #include "io-util.h"
 #include "journal-util.h"
 #include "list.h"
@@ -51,6 +51,7 @@
 #include "logs-show.h"
 #include "macro.h"
 #include "main-func.h"
+#include "memory-util.h"
 #include "mkdir.h"
 #include "pager.h"
 #include "parse-util.h"
@@ -77,7 +78,6 @@
 #include "unit-name.h"
 #include "user-util.h"
 #include "utf8.h"
-#include "util.h"
 #include "utmp-wtmp.h"
 #include "verbs.h"
 #include "virt.h"

src/test/test-alloc-util.c

@@ -4,7 +4,7 @@
 
 #include "alloc-util.h"
 #include "macro.h"
-#include "util.h"
+#include "memory-util.h"
 
 static void test_alloca(void) {
         static const uint8_t zero[997] = { };

src/test/test-fd-util.c

@@ -7,6 +7,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "random-util.h"
@@ -14,7 +15,6 @@
 #include "string-util.h"
 #include "tests.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 static void test_close_many(void) {
         int fds[3];

src/test/test-seccomp.c

@@ -13,6 +13,7 @@
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "missing.h"
 #include "nsflags.h"
 #include "process-util.h"
@@ -21,7 +22,6 @@
 #include "set.h"
 #include "string-util.h"
 #include "tests.h"
-#include "util.h"
 #include "virt.h"
 
 #if SCMP_SYS(socket) < 0 || defined(__i386__) || defined(__s390x__) || defined(__s390__)

src/test/test-sigbus.c

@@ -1,15 +1,17 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
+#include <fcntl.h>
 #include <sys/mman.h>
+#include <unistd.h>
 
 #if HAVE_VALGRIND_VALGRIND_H
 #  include <valgrind/valgrind.h>
 #endif
 
 #include "fd-util.h"
+#include "memory-util.h"
 #include "sigbus.h"
 #include "tests.h"
-#include "util.h"
 
 int main(int argc, char *argv[]) {
         _cleanup_close_ int fd = -1;

src/test/test-siphash24.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
+#include "memory-util.h"
 #include "siphash24.h"
-#include "util.h"
 
 #define ITERATIONS 10000000ULL
 

src/test/test-sleep.c

@@ -6,10 +6,10 @@
 
 #include "fd-util.h"
 #include "log.h"
+#include "memory-util.h"
 #include "sleep-config.h"
 #include "strv.h"
 #include "tests.h"
-#include "util.h"
 
 static void test_parse_sleep_config(void) {
         const char *verb;

src/test/test-unaligned.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
+#include "memory-util.h"
 #include "sparse-endian.h"
 #include "unaligned.h"
-#include "util.h"
 
 static uint8_t data[] = {
         0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,

src/test/test-unit-file.c

@@ -20,6 +20,7 @@
 #include "install.h"
 #include "load-fragment.h"
 #include "macro.h"
+#include "memory-util.h"
 #include "rm-rf.h"
 #include "specifier.h"
 #include "string-util.h"
@@ -28,7 +29,6 @@
 #include "tests.h"
 #include "tmpfile-util.h"
 #include "user-util.h"
-#include "util.h"
 
 static int test_unit_file_get_set(void) {
         int r;

src/test/test-util.c

@@ -16,7 +16,7 @@
 #include "rm-rf.h"
 #include "string-util.h"
 #include "tests.h"
-#include "util.h"
+#include "memory-util.h"
 
 static void test_align_power2(void) {
         unsigned long i, p2;

src/timedate/timedated.c

@@ -20,6 +20,7 @@
 #include "hashmap.h"
 #include "list.h"
 #include "main-func.h"
+#include "memory-util.h"
 #include "missing_capability.h"
 #include "path-util.h"
 #include "selinux-util.h"
@@ -29,7 +30,6 @@
 #include "unit-def.h"
 #include "unit-name.h"
 #include "user-util.h"
-#include "util.h"
 
 #define NULL_ADJTIME_UTC "0.0 0 0\n0\nUTC\n"
 #define NULL_ADJTIME_LOCAL "0.0 0 0\n0\nLOCAL\n"

src/tty-ask-password-agent/tty-ask-password-agent.c

@@ -31,6 +31,7 @@
 #include "io-util.h"
 #include "macro.h"
 #include "main-func.h"
+#include "memory-util.h"
 #include "mkdir.h"
 #include "path-util.h"
 #include "pretty-print.h"
@@ -40,7 +41,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
-#include "util.h"
 #include "utmp-wtmp.h"
 
 static enum {

src/udev/ata_id/ata_id.c

@@ -26,8 +26,8 @@
 #include "fd-util.h"
 #include "libudev-util.h"
 #include "log.h"
+#include "memory-util.h"
 #include "udev-util.h"
-#include "util.h"
 
 #define COMMAND_TIMEOUT_MSEC (30 * 1000)
 

src/udev/cdrom_id/cdrom_id.c

@@ -21,9 +21,9 @@
 #include <unistd.h>
 
 #include "log.h"
+#include "memory-util.h"
 #include "random-util.h"
 #include "udev-util.h"
-#include "util.h"
 
 /* device info */
 static unsigned cd_cd_rom;

src/udev/net/ethtool-util.c

@@ -9,11 +9,11 @@
 #include "ethtool-util.h"
 #include "link-config.h"
 #include "log.h"
+#include "memory-util.h"
 #include "missing.h"
 #include "socket-util.h"
 #include "string-table.h"
 #include "strxcpyx.h"
-#include "util.h"
 
 static const char* const duplex_table[_DUP_MAX] = {
         [DUP_FULL] = "full",

src/udev/net/link-config.c

@@ -14,6 +14,7 @@
 #include "fd-util.h"
 #include "link-config.h"
 #include "log.h"
+#include "memory-util.h"
 #include "missing_network.h"
 #include "naming-scheme.h"
 #include "netlink-util.h"
@@ -26,7 +27,6 @@
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 
 struct link_config_ctx {
         LIST_HEAD(link_config, links);

src/udev/scsi_id/scsi_serial.c

@@ -21,11 +21,11 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "memory-util.h"
 #include "random-util.h"
 #include "scsi.h"
 #include "scsi_id.h"
 #include "string-util.h"
-#include "util.h"
 
 /*
  * A priority based list of id, naa, and binary/ascii for the identifier