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/basic/argv-util.c

@@ -8,6 +8,7 @@
 #include "argv-util.h"
 #include "capability-util.h"
 #include "errno-util.h"
+#include "log.h"
 #include "missing_sched.h"
 #include "parse-util.h"
 #include "path-util.h"

src/basic/build.c

@@ -6,6 +6,7 @@
 #include "ansi-color.h"
 #include "build.h"
 #include "extract-word.h"
+#include "log.h"
 #include "macro.h"
 #include "string-util.h"
 #include "terminal-util.h"

src/basic/cap-list.c

@@ -8,6 +8,7 @@
 #include "capability-util.h"
 #include "cap-list.h"
 #include "extract-word.h"
+#include "log.h"
 #include "macro.h"
 #include "parse-util.h"
 #include "stdio-util.h"

src/basic/chattr-util.c

@@ -10,6 +10,7 @@
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
+#include "log.h"
 #include "macro.h"
 #include "string-util.h"
 

src/basic/compress.c

@@ -27,6 +27,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "io-util.h"
+#include "log.h"
 #include "macro.h"
 #include "sparse-endian.h"
 #include "string-table.h"

src/basic/confidential-virt.c

@@ -14,6 +14,7 @@
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "log.h"
 #include "string-table.h"
 #include "utf8.h"
 

src/basic/dlfcn-util.c

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "dlfcn-util.h"
+#include "log.h"
 
 static int dlsym_many_or_warnv(void *dl, int log_level, va_list ap) {
         void (**fn)(void);

src/basic/efivars.c

@@ -15,6 +15,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "io-util.h"
+#include "log.h"
 #include "macro.h"
 #include "memory-util.h"
 #include "missing_fs.h"

src/basic/env-file.c

@@ -7,6 +7,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
+#include "log.h"
 #include "string-util.h"
 #include "strv.h"
 #include "tmpfile-util.h"

src/basic/env-util.c

@@ -11,6 +11,7 @@
 #include "errno-util.h"
 #include "escape.h"
 #include "extract-word.h"
+#include "log.h"
 #include "macro.h"
 #include "parse-util.h"
 #include "path-util.h"

src/basic/ether-addr-util.c

@@ -8,6 +8,7 @@
 
 #include "ether-addr-util.h"
 #include "hexdecoct.h"
+#include "log.h"
 #include "macro.h"
 #include "string-util.h"
 

src/basic/fd-util.c

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

src/basic/format-ifname.c

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

src/basic/gcrypt-util.c

@@ -4,6 +4,7 @@
 
 #include "gcrypt-util.h"
 #include "hexdecoct.h"
+#include "log.h"
 
 static void *gcrypt_dl = NULL;
 

src/basic/glob-util.c

@@ -8,6 +8,7 @@
 #include "dirent-util.h"
 #include "errno-util.h"
 #include "glob-util.h"
+#include "log.h"
 #include "macro.h"
 #include "path-util.h"
 #include "strv.h"

src/basic/hashmap.c

@@ -12,6 +12,7 @@
 #include "alloc-util.h"
 #include "fileio.h"
 #include "hashmap.h"
+#include "log.h"
 #include "logarithm.h"
 #include "macro.h"
 #include "memory-util.h"

src/basic/hostname-util.c

@@ -10,6 +10,7 @@
 #include "alloc-util.h"
 #include "env-file.h"
 #include "hostname-util.h"
+#include "log.h"
 #include "os-util.h"
 #include "string-util.h"
 #include "strv.h"

src/basic/initrd-util.c

@@ -5,6 +5,7 @@
 #include "env-util.h"
 #include "errno-util.h"
 #include "initrd-util.h"
+#include "log.h"
 #include "parse-util.h"
 #include "stat-util.h"
 #include "string-util.h"

src/basic/keyring-util.c

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "keyring-util.h"
+#include "log.h"
 #include "memory-util.h"
 #include "missing_syscall.h"
 

src/basic/limits-util.c

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

src/basic/locale-util.c

@@ -17,6 +17,7 @@
 #include "fileio.h"
 #include "hashmap.h"
 #include "locale-util.h"
+#include "log.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "set.h"

src/basic/lock-util.c

@@ -13,6 +13,7 @@
 #include "fd-util.h"
 #include "fs-util.h"
 #include "lock-util.h"
+#include "log.h"
 #include "macro.h"
 #include "missing_fcntl.h"
 #include "path-util.h"

src/basic/macro.h

@@ -232,5 +232,3 @@ static inline size_t size_add(size_t x, size_t y) {
         for (typeof(entry) _va_sentinel_[1] = {}, _entries_[] = { __VA_ARGS__ __VA_OPT__(,) _va_sentinel_[0] }, *_current_ = _entries_; \
              ((long)(_current_ - _entries_) < (long)(ELEMENTSOF(_entries_) - 1)) && ({ entry = *_current_; true; }); \
              _current_++)
-
-#include "log.h"

src/basic/memfd-util.c

@@ -9,6 +9,7 @@
 #include "alloc-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
+#include "log.h"
 #include "macro.h"
 #include "memfd-util.h"
 #include "missing_fcntl.h"

src/basic/mempool.c

@@ -4,6 +4,7 @@
 #include <stdlib.h>
 
 #include "format-util.h"
+#include "log.h"
 #include "macro.h"
 #include "memory-util.h"
 #include "mempool.h"

src/basic/mkdir.c

@@ -10,6 +10,7 @@
 #include "fd-util.h"
 #include "format-util.h"
 #include "fs-util.h"
+#include "log.h"
 #include "macro.h"
 #include "mkdir.h"
 #include "path-util.h"

src/basic/mountpoint-util.c

@@ -10,6 +10,7 @@
 #include "fileio.h"
 #include "filesystems.h"
 #include "fs-util.h"
+#include "log.h"
 #include "missing_fcntl.h"
 #include "missing_fs.h"
 #include "missing_syscall.h"

src/basic/namespace-util.c

@@ -7,6 +7,7 @@
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "log.h"
 #include "missing_fs.h"
 #include "missing_magic.h"
 #include "missing_namespace.h"

src/basic/os-util.c

@@ -9,6 +9,7 @@
 #include "fileio.h"
 #include "fs-util.h"
 #include "glyph-util.h"
+#include "log.h"
 #include "macro.h"
 #include "os-util.h"
 #include "parse-util.h"

src/basic/parse-util.c

@@ -13,6 +13,7 @@
 #include "errno-list.h"
 #include "extract-word.h"
 #include "locale-util.h"
+#include "log.h"
 #include "macro.h"
 #include "missing_network.h"
 #include "parse-util.h"

src/basic/pidfd-util.c

@@ -7,6 +7,7 @@
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "log.h"
 #include "macro.h"
 #include "memory-util.h"
 #include "missing_fs.h"

src/basic/pidref.c

@@ -2,6 +2,7 @@
 
 #include "errno-util.h"
 #include "fd-util.h"
+#include "log.h"
 #include "missing_syscall.h"
 #include "missing_wait.h"
 #include "parse-util.h"

src/basic/procfs-util.c

@@ -7,6 +7,7 @@
 #include "constants.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "log.h"
 #include "parse-util.h"
 #include "process-util.h"
 #include "procfs-util.h"

src/basic/random-util.c

@@ -20,6 +20,7 @@
 #include "fileio.h"
 #include "io-util.h"
 #include "iovec-util.h"
+#include "log.h"
 #include "missing_random.h"
 #include "missing_syscall.h"
 #include "parse-util.h"

src/basic/recurse-dir.c

@@ -5,6 +5,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
+#include "log.h"
 #include "mountpoint-util.h"
 #include "recurse-dir.h"
 #include "sort-util.h"

src/basic/rlimit-util.c

@@ -8,6 +8,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-util.h"
+#include "log.h"
 #include "macro.h"
 #include "process-util.h"
 #include "rlimit-util.h"

src/basic/sigbus.c

@@ -5,6 +5,7 @@
 #include <stddef.h>
 #include <sys/mman.h>
 
+#include "log.h"
 #include "macro.h"
 #include "memory-util.h"
 #include "missing_syscall.h"

src/basic/stat-util.c

@@ -16,6 +16,7 @@
 #include "filesystems.h"
 #include "fs-util.h"
 #include "hash-funcs.h"
+#include "log.h"
 #include "macro.h"
 #include "missing_fs.h"
 #include "missing_magic.h"

src/basic/string-util.c

@@ -14,6 +14,7 @@
 #include "glyph-util.h"
 #include "gunicode.h"
 #include "locale-util.h"
+#include "log.h"
 #include "macro.h"
 #include "memory-util.h"
 #include "memstream-util.h"
@@ -1042,6 +1043,15 @@ int free_and_strdup(char **p, const char *s) {
         return 1;
 }
 
+int free_and_strdup_warn(char **p, const char *s) {
+        int r;
+
+        r = free_and_strdup(p, s);
+        if (r < 0)
+                return log_oom();
+        return r;
+}
+
 int free_and_strndup(char **p, const char *s, size_t l) {
         char *t;
 

src/basic/string-util.h

@@ -215,14 +215,7 @@ char* strrep(const char *s, unsigned n);
 int split_pair(const char *s, const char *sep, char **ret_first, char **ret_second);
 
 int free_and_strdup(char **p, const char *s);
-static inline int free_and_strdup_warn(char **p, const char *s) {
-        int r;
-
-        r = free_and_strdup(p, s);
-        if (r < 0)
-                return log_oom();
-        return r;
-}
+int free_and_strdup_warn(char **p, const char *s);
 int free_and_strndup(char **p, const char *s, size_t l) _nonnull_if_nonzero_(2, 3);
 
 int strdup_to_full(char **ret, const char *src);

src/basic/strv.c

@@ -12,6 +12,7 @@
 #include "extract-word.h"
 #include "fileio.h"
 #include "gunicode.h"
+#include "log.h"
 #include "memory-util.h"
 #include "nulstr-util.h"
 #include "sort-util.h"

src/basic/sync-util.c

@@ -5,6 +5,7 @@
 
 #include "fd-util.h"
 #include "fs-util.h"
+#include "log.h"
 #include "path-util.h"
 #include "sync-util.h"
 

src/basic/tmpfile-util.c

@@ -7,6 +7,7 @@
 #include "fileio.h"
 #include "fs-util.h"
 #include "hexdecoct.h"
+#include "log.h"
 #include "macro.h"
 #include "memfd-util.h"
 #include "missing_fcntl.h"

src/basic/uid-classification.c

@@ -5,6 +5,7 @@
 #include "chase.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "log.h"
 #include "string-util.h"
 #include "uid-classification.h"
 #include "user-util.h"

src/basic/uid-range.c

@@ -8,6 +8,7 @@
 #include "errno-util.h"
 #include "fd-util.h"
 #include "format-util.h"
+#include "log.h"
 #include "macro.h"
 #include "namespace-util.h"
 #include "path-util.h"

src/basic/unit-name.c

@@ -10,6 +10,7 @@
 #include "alloc-util.h"
 #include "glob-util.h"
 #include "hexdecoct.h"
+#include "log.h"
 #include "memory-util.h"
 #include "path-util.h"
 #include "random-util.h"

src/basic/user-util.c

@@ -20,6 +20,7 @@
 #include "fileio.h"
 #include "format-util.h"
 #include "lock-util.h"
+#include "log.h"
 #include "macro.h"
 #include "mkdir.h"
 #include "parse-util.h"

src/basic/virt.c

@@ -15,6 +15,7 @@
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "log.h"
 #include "macro.h"
 #include "namespace-util.h"
 #include "process-util.h"