basic: Stop including log.h in macro.h

Now that the necessary functions from log.h have been moved to macro.h,
we can stop including log.h in macro.h. This requires modifying source
files all over the tree to include log.h instead.

src/shared/acl-util.c

@@ -8,6 +8,7 @@
 #include "acl-util.h"
 #include "alloc-util.h"
 #include "errno-util.h"
+#include "log.h"
 #include "string-util.h"
 #include "strv.h"
 #include "user-util.h"

src/shared/apparmor-util.c

@@ -5,6 +5,7 @@
 #include "alloc-util.h"
 #include "apparmor-util.h"
 #include "fileio.h"
+#include "log.h"
 #include "parse-util.h"
 
 #if HAVE_APPARMOR

src/shared/binfmt-util.c

@@ -9,6 +9,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
+#include "log.h"
 #include "missing_magic.h"
 #include "stat-util.h"
 

src/shared/boot-entry.c

@@ -5,6 +5,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "id128-util.h"
+#include "log.h"
 #include "os-util.h"
 #include "path-util.h"
 #include "string-table.h"

src/shared/bootspec.c

@@ -14,6 +14,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "find-esp.h"
+#include "log.h"
 #include "path-util.h"
 #include "pe-binary.h"
 #include "pretty-print.h"

src/shared/btrfs-util.c

@@ -23,6 +23,7 @@
 #include "fileio.h"
 #include "fs-util.h"
 #include "io-util.h"
+#include "log.h"
 #include "macro.h"
 #include "missing_fs.h"
 #include "path-util.h"
@@ -510,6 +511,12 @@ finish:
         return 0;
 }
 
+int btrfs_log_dev_root(int level, int ret, const char *p) {
+        return log_full_errno(level, ret,
+                              "File system behind %s is reported by btrfs to be backed by pseudo-device /dev/root, which is not a valid userspace accessible device node. "
+                              "Cannot determine correct backing block device.", p);
+}
+
 int btrfs_qgroup_get_quota(const char *path, uint64_t qgroupid, BtrfsQuotaInfo *ret) {
         _cleanup_close_ int fd = -EBADF;
 

src/shared/btrfs-util.h

@@ -130,11 +130,7 @@ int btrfs_qgroup_find_parents(int fd, uint64_t qgroupid, uint64_t **ret);
 int btrfs_qgroup_get_quota_fd(int fd, uint64_t qgroupid, BtrfsQuotaInfo *quota);
 int btrfs_qgroup_get_quota(const char *path, uint64_t qgroupid, BtrfsQuotaInfo *quota);
 
-static inline int btrfs_log_dev_root(int level, int ret, const char *p) {
-        return log_full_errno(level, ret,
-                              "File system behind %s is reported by btrfs to be backed by pseudo-device /dev/root, which is not a valid userspace accessible device node. "
-                              "Cannot determine correct backing block device.", p);
-}
+int btrfs_log_dev_root(int level, int ret, const char *p);
 
 static inline bool btrfs_might_be_subvol(const struct stat *st) {
         if (!st)

src/shared/bus-get-properties.c

@@ -2,6 +2,7 @@
 
 #include "bus-get-properties.h"
 #include "bus-message-util.h"
+#include "log.h"
 #include "rlimit-util.h"
 #include "stdio-util.h"
 #include "string-util.h"

src/shared/bus-map-properties.c

@@ -1,11 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "bus-map-properties.h"
 #include "alloc-util.h"
-#include "bus-util.h"
-#include "strv.h"
-#include "bus-message.h"
+#include "bus-map-properties.h"
 #include "bus-message-util.h"
+#include "bus-message.h"
+#include "bus-util.h"
+#include "log.h"
+#include "strv.h"
 
 int bus_map_id128(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *error, void *userdata) {
         sd_id128_t *p = userdata;

src/shared/bus-object.c

@@ -2,6 +2,7 @@
 
 #include "bus-introspect.h"
 #include "bus-object.h"
+#include "log.h"
 #include "macro.h"
 #include "string-util.h"
 #include "strv.h"

src/shared/bus-polkit.c

@@ -4,6 +4,7 @@
 #include "bus-message.h"
 #include "bus-polkit.h"
 #include "bus-util.h"
+#include "log.h"
 #include "process-util.h"
 #include "strv.h"
 #include "user-util.h"

src/shared/bus-print-properties.c

@@ -5,6 +5,7 @@
 #include "cgroup-util.h"
 #include "escape.h"
 #include "mountpoint-util.h"
+#include "log.h"
 #include "nsflags.h"
 #include "parse-util.h"
 #include "stdio-util.h"

src/shared/bus-unit-procs.c

@@ -6,6 +6,7 @@
 #include "glyph-util.h"
 #include "hashmap.h"
 #include "list.h"
+#include "log.h"
 #include "macro.h"
 #include "path-util.h"
 #include "process-util.h"

src/shared/bus-util.c

@@ -24,6 +24,7 @@
 #include "env-util.h"
 #include "fd-util.h"
 #include "format-util.h"
+#include "log.h"
 #include "memfd-util.h"
 #include "memstream-util.h"
 #include "path-util.h"

src/shared/bus-util.h

@@ -10,6 +10,7 @@
 #include "sd-event.h"
 
 #include "errno-util.h"
+#include "log.h"
 #include "macro.h"
 #include "pidref.h"
 #include "runtime-scope.h"

src/shared/bus-wait-for-jobs.c

@@ -5,6 +5,7 @@
 #include "bus-util.h"
 #include "bus-wait-for-jobs.h"
 #include "escape.h"
+#include "log.h"
 #include "set.h"
 #include "strv.h"
 #include "unit-def.h"

src/shared/bus-wait-for-units.c

@@ -4,6 +4,7 @@
 #include "bus-map-properties.h"
 #include "bus-wait-for-units.h"
 #include "hashmap.h"
+#include "log.h"
 #include "string-util.h"
 #include "strv.h"
 #include "unit-def.h"

src/shared/calendarspec.c

@@ -14,6 +14,7 @@
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "log.h"
 #include "macro.h"
 #include "memstream-util.h"
 #include "parse-util.h"

src/shared/cgroup-setup.c

@@ -8,6 +8,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
+#include "log.h"
 #include "missing_magic.h"
 #include "mkdir.h"
 #include "parse-util.h"

src/shared/cgroup-show.c

@@ -18,6 +18,7 @@
 #include "format-util.h"
 #include "hostname-util.h"
 #include "locale-util.h"
+#include "log.h"
 #include "macro.h"
 #include "nulstr-util.h"
 #include "output-mode.h"

src/shared/common-signal.c

@@ -3,6 +3,7 @@
 #include "common-signal.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "log.h"
 #include "memstream-util.h"
 #include "process-util.h"
 #include "signal-util.h"

src/shared/copy.c

@@ -20,6 +20,7 @@
 #include "fileio.h"
 #include "fs-util.h"
 #include "io-util.h"
+#include "log.h"
 #include "macro.h"
 #include "missing_fs.h"
 #include "missing_syscall.h"

src/shared/coredump-util.c

@@ -5,6 +5,7 @@
 #include "coredump-util.h"
 #include "extract-word.h"
 #include "fileio.h"
+#include "log.h"
 #include "stdio-util.h"
 #include "string-table.h"
 #include "unaligned.h"

src/shared/creds-util.c

@@ -25,6 +25,7 @@
 #include "fs-util.h"
 #include "io-util.h"
 #include "json-util.h"
+#include "log.h"
 #include "memory-util.h"
 #include "mkdir-label.h"
 #include "openssl-util.h"

src/shared/dns-domain.c

@@ -13,6 +13,7 @@
 #include "hostname-util.h"
 #include "idn-util.h"
 #include "in-addr-util.h"
+#include "log.h"
 #include "macro.h"
 #include "parse-util.h"
 #include "string-util.h"

src/shared/edit-util.c

@@ -9,6 +9,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
+#include "log.h"
 #include "mkdir-label.h"
 #include "path-util.h"
 #include "process-util.h"

src/shared/efi-api.c

@@ -9,6 +9,7 @@
 #include "efivars.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "log.h"
 #include "sort-util.h"
 #include "stat-util.h"
 #include "stdio-util.h"

src/shared/efi-loader.c

@@ -4,6 +4,7 @@
 #include "efi-api.h"
 #include "efi-loader.h"
 #include "env-util.h"
+#include "log.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "stat-util.h"

src/shared/efi-loader.h

@@ -5,6 +5,7 @@
 
 #include "efivars-fundamental.h"
 #include "efivars.h"
+#include "log.h"
 
 /* Various calls that interface with EFI variables implementing https://systemd.io/BOOT_LOADER_INTERFACE */
 

src/shared/elf-util.c

@@ -21,6 +21,7 @@
 #include "format-util.h"
 #include "hexdecoct.h"
 #include "io-util.h"
+#include "log.h"
 #include "macro.h"
 #include "memstream-util.h"
 #include "path-util.h"

src/shared/elf-util.h

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include "log.h"
 #include "sd-json.h"
 
 #if HAVE_ELFUTILS

src/shared/fido2-util.c

@@ -3,6 +3,7 @@
 #include "fido2-util.h"
 #include "fileio.h"
 #include "libfido2-util.h"
+#include "log.h"
 #include "random-util.h"
 
 int fido2_generate_salt(struct iovec *ret_salt) {

src/shared/format-table.c

@@ -18,6 +18,7 @@
 #include "gunicode.h"
 #include "id128-util.h"
 #include "in-addr-util.h"
+#include "log.h"
 #include "memory-util.h"
 #include "memstream-util.h"
 #include "pager.h"

src/shared/fstab-util.h

@@ -3,6 +3,7 @@
 
 #include <stdbool.h>
 #include <stddef.h>
+#include <stdlib.h>
 
 #include "assert-util.h"
 #include "macro.h"

src/shared/group-record.c

@@ -3,6 +3,7 @@
 #include "bitfield.h"
 #include "group-record.h"
 #include "json-util.h"
+#include "log.h"
 #include "strv.h"
 #include "uid-classification.h"
 #include "user-util.h"

src/shared/hwdb-util.c

@@ -13,6 +13,7 @@
 #include "hwdb-internal.h"
 #include "hwdb-util.h"
 #include "label-util.h"
+#include "log.h"
 #include "mkdir-label.h"
 #include "nulstr-util.h"
 #include "path-util.h"

src/shared/idn-util.c

@@ -10,6 +10,7 @@
 #include "alloc-util.h"
 #include "dlfcn-util.h"
 #include "idn-util.h"
+#include "log.h"
 
 #if HAVE_LIBIDN || HAVE_LIBIDN2
 static void* idn_dl = NULL;

src/shared/install-file.c

@@ -8,6 +8,7 @@
 #include "fd-util.h"
 #include "fs-util.h"
 #include "install-file.h"
+#include "log.h"
 #include "missing_syscall.h"
 #include "rm-rf.h"
 #include "sync-util.h"

src/shared/journal-file-util.c

@@ -10,6 +10,7 @@
 #include "format-util.h"
 #include "journal-authenticate.h"
 #include "journal-file-util.h"
+#include "log.h"
 #include "path-util.h"
 #include "random-util.h"
 #include "set.h"

src/shared/journal-importer.c

@@ -12,6 +12,7 @@
 #include "journal-file.h"
 #include "journal-importer.h"
 #include "journal-util.h"
+#include "log.h"
 #include "parse-util.h"
 #include "string-util.h"
 #include "strv.h"

src/shared/kernel-image.c

@@ -4,6 +4,7 @@
 #include "fileio.h"
 #include "env-file.h"
 #include "kernel-image.h"
+#include "log.h"
 #include "os-util.h"
 #include "parse-util.h"
 #include "pe-binary.h"

src/shared/killall.c

@@ -16,6 +16,7 @@
 #include "format-util.h"
 #include "initrd-util.h"
 #include "killall.h"
+#include "log.h"
 #include "parse-util.h"
 #include "process-util.h"
 #include "set.h"

src/shared/libarchive-util.c

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "libarchive-util.h"
+#include "log.h"
 
 #if HAVE_LIBARCHIVE
 static void *libarchive_dl = NULL;

src/shared/libfido2-util.c

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "libfido2-util.h"
+#include "log.h"
 
 #if HAVE_LIBFIDO2
 #include "alloc-util.h"
@@ -9,7 +10,6 @@
 #include "dlfcn-util.h"
 #include "format-table.h"
 #include "glyph-util.h"
-#include "log.h"
 #include "memory-util.h"
 #include "plymouth-util.h"
 #include "strv.h"

src/shared/libmount-util.c

@@ -3,6 +3,7 @@
 #include <stdio.h>
 
 #include "libmount-util.h"
+#include "log.h"
 
 int libmount_parse_full(
                 const char *path,

src/shared/local-addresses.c

@@ -7,6 +7,7 @@
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "local-addresses.h"
+#include "log.h"
 #include "macro.h"
 #include "netlink-util.h"
 #include "sort-util.h"

src/shared/loopback-setup.c

@@ -5,6 +5,7 @@
 
 #include "sd-netlink.h"
 
+#include "log.h"
 #include "loopback-setup.h"
 #include "missing_network.h"
 #include "netlink-util.h"

src/shared/lsm-util.c

@@ -3,6 +3,7 @@
 #include "alloc-util.h"
 #include "extract-word.h"
 #include "fileio.h"
+#include "log.h"
 #include "lsm-util.h"
 #include "mountpoint-util.h"
 #include "string-util.h"

src/shared/machine-credential.c

@@ -5,6 +5,7 @@
 #include "escape.h"
 #include "extract-word.h"
 #include "fileio.h"
+#include "log.h"
 #include "macro.h"
 #include "memory-util.h"
 #include "machine-credential.h"

src/shared/machine-pool.c

@@ -4,6 +4,7 @@
 
 #include "btrfs-util.h"
 #include "label-util.h"
+#include "log.h"
 #include "machine-pool.h"
 #include "missing_magic.h"
 #include "stat-util.h"

src/shared/notify-recv.c

@@ -2,6 +2,7 @@
 
 #include "async.h"
 #include "fd-util.h"
+#include "log.h"
 #include "notify-recv.h"
 #include "socket-util.h"
 #include "strv.h"

src/shared/nsflags.c

@@ -4,6 +4,7 @@
 
 #include "alloc-util.h"
 #include "extract-word.h"
+#include "log.h"
 #include "namespace-util.h"
 #include "nsflags.h"
 #include "string-util.h"

src/shared/nsresource.c

@@ -7,6 +7,7 @@
 #include "fd-util.h"
 #include "format-util.h"
 #include "json-util.h"
+#include "log.h"
 #include "missing_sched.h"
 #include "namespace-util.h"
 #include "nsresource.h"

src/shared/numa-util.c

@@ -8,6 +8,7 @@
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "log.h"
 #include "macro.h"
 #include "missing_syscall.h"
 #include "numa-util.h"

src/shared/openssl-util.c

@@ -7,6 +7,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "hexdecoct.h"
+#include "log.h"
 #include "memory-util.h"
 #include "memstream-util.h"
 #include "openssl-util.h"

src/shared/pam-util.c

@@ -9,6 +9,7 @@
 #include "errno-util.h"
 #include "fd-util.h"
 #include "format-util.h"
+#include "log.h"
 #include "macro.h"
 #include "pam-util.h"
 #include "process-util.h"

src/shared/parse-argument.c

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "format-table.h"
+#include "log.h"
 #include "parse-argument.h"
 #include "path-util.h"
 #include "signal-util.h"

src/shared/pcrextend-util.c

@@ -8,6 +8,7 @@
 #include "errno-util.h"
 #include "escape.h"
 #include "fd-util.h"
+#include "log.h"
 #include "mountpoint-util.h"
 #include "pcrextend-util.h"
 #include "strv.h"

src/shared/pkcs11-util.c

@@ -9,6 +9,7 @@
 #include "fd-util.h"
 #include "format-table.h"
 #include "io-util.h"
+#include "log.h"
 #include "memory-util.h"
 #if HAVE_OPENSSL
 #include "openssl-util.h"

src/shared/pkcs11-util.h

@@ -14,6 +14,7 @@
 
 #include "ask-password-api.h"
 #include "dlfcn-util.h"
+#include "log.h"
 #include "macro.h"
 #include "time-util.h"
 

src/shared/plymouth-util.c

@@ -2,6 +2,7 @@
 
 #include "fd-util.h"
 #include "io-util.h"
+#include "log.h"
 #include "plymouth-util.h"
 #include "socket-util.h"
 

src/shared/portable-util.c

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "fs-util.h"
+#include "log.h"
 #include "nulstr-util.h"
 #include "portable-util.h"
 #include "string-util.h"

src/shared/pretty-print.c

@@ -12,6 +12,7 @@
 #include "env-util.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "log.h"
 #include "pager.h"
 #include "path-util.h"
 #include "pretty-print.h"

src/shared/resize-fs.c

@@ -6,6 +6,7 @@
 
 #include "blockdev-util.h"
 #include "fs-util.h"
+#include "log.h"
 #include "missing_fs.h"
 #include "missing_magic.h"
 #include "missing_xfs.h"

src/shared/seccomp-util.c

@@ -17,6 +17,7 @@
 #include "alloc-util.h"
 #include "env-util.h"
 #include "errno-list.h"
+#include "log.h"
 #include "macro.h"
 #include "namespace-util.h"
 #include "nsflags.h"

src/shared/service-util.c

@@ -5,6 +5,7 @@
 
 #include "alloc-util.h"
 #include "build.h"
+#include "log.h"
 #include "pretty-print.h"
 #include "service-util.h"
 #include "terminal-util.h"

src/shared/shift-uid.c

@@ -6,6 +6,7 @@
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "log.h"
 #include "missing_magic.h"
 #include "shift-uid.h"
 #include "stat-util.h"

src/shared/tests.h

@@ -9,6 +9,7 @@
 
 #include "argv-util.h"
 #include "errno-util.h"
+#include "log.h"
 #include "macro.h"
 #include "process-util.h"
 #include "rlimit-util.h"

src/shared/unit-file.c

@@ -7,6 +7,7 @@
 #include "fd-util.h"
 #include "fs-util.h"
 #include "initrd-util.h"
+#include "log.h"
 #include "macro.h"
 #include "path-lookup.h"
 #include "set.h"

src/shared/user-record-nss.c

@@ -3,6 +3,7 @@
 #include "errno-util.h"
 #include "format-util.h"
 #include "libcrypt-util.h"
+#include "log.h"
 #include "strv.h"
 #include "user-record-nss.h"
 #include "user-util.h"

src/shared/user-record-show.c

@@ -6,6 +6,7 @@
 #include "glyph-util.h"
 #include "hashmap.h"
 #include "hexdecoct.h"
+#include "log.h"
 #include "path-util.h"
 #include "percent-util.h"
 #include "pretty-print.h"

src/shared/user-record.c

@@ -14,6 +14,7 @@
 #include "hostname-util.h"
 #include "json-util.h"
 #include "locale-util.h"
+#include "log.h"
 #include "memory-util.h"
 #include "path-util.h"
 #include "percent-util.h"

src/shared/userdb-dropin.c

@@ -5,6 +5,7 @@
 #include "fileio.h"
 #include "format-util.h"
 #include "group-record.h"
+#include "log.h"
 #include "path-util.h"
 #include "stdio-util.h"
 #include "user-util.h"

src/shared/userdb.c

@@ -12,6 +12,7 @@
 #include "fd-util.h"
 #include "format-util.h"
 #include "json-util.h"
+#include "log.h"
 #include "missing_syscall.h"
 #include "parse-util.h"
 #include "set.h"

src/shared/utmp-wtmp.c

@@ -12,6 +12,7 @@
 #include "alloc-util.h"
 #include "errno-util.h"
 #include "hostname-util.h"
+#include "log.h"
 #include "macro.h"
 #include "memory-util.h"
 #include "path-util.h"

src/shared/varlink-io.systemd.service.c

@@ -4,6 +4,7 @@
 
 #include "env-util.h"
 #include "json-util.h"
+#include "log.h"
 #include "strv.h"
 #include "varlink-io.systemd.service.h"
 

src/shared/varlink-serialize.c

@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "log.h"
 #include "parse-util.h"
 #include "varlink-internal.h"
 #include "varlink-serialize.h"

src/shared/vconsole-util.c

@@ -4,6 +4,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "kbd-util.h"
+#include "log.h"
 #include "string-util.h"
 #include "strv.h"
 #include "vconsole-util.h"

src/shared/vpick.c

@@ -7,6 +7,7 @@
 #include "chase.h"
 #include "fd-util.h"
 #include "fs-util.h"
+#include "log.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "recurse-dir.h"

src/shared/xml.c

@@ -3,6 +3,7 @@
 #include <errno.h>
 #include <stddef.h>
 
+#include "log.h"
 #include "macro.h"
 #include "string-util.h"
 #include "xml.h"