util-lib: split out allocation calls into alloc-util.[ch]

Makefile.am

@@ -943,6 +943,8 @@ libbasic_la_SOURCES = \
 	src/basic/rm-rf.h \
 	src/basic/copy.c \
 	src/basic/copy.h \
+	src/basic/alloc-util.h \
+	src/basic/alloc-util.c \
 	src/basic/formats-util.h
 
 nodist_libbasic_la_SOURCES = \

src/activate/activate.c

@@ -28,13 +28,14 @@
 
 #include "sd-daemon.h"
 
+#include "alloc-util.h"
+#include "fd-util.h"
 #include "log.h"
 #include "macro.h"
 #include "signal-util.h"
 #include "socket-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "fd-util.h"
 
 static char** arg_listen = NULL;
 static bool arg_accept = false;

src/analyze/analyze-verify.c

@@ -21,6 +21,7 @@
 
 #include <stdlib.h>
 
+#include "alloc-util.h"
 #include "analyze-verify.h"
 #include "bus-util.h"
 #include "log.h"

src/analyze/analyze.c

@@ -27,6 +27,7 @@
 
 #include "sd-bus.h"
 
+#include "alloc-util.h"
 #include "analyze-verify.h"
 #include "bus-error.h"
 #include "bus-util.h"

src/backlight/backlight.c

@@ -21,6 +21,7 @@
 
 #include "libudev.h"
 
+#include "alloc-util.h"
 #include "def.h"
 #include "escape.h"
 #include "fileio.h"

src/basic/alloc-util.c

@@ -0,0 +1,81 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include "alloc-util.h"
+#include "util.h"
+
+void* memdup(const void *p, size_t l) {
+        void *r;
+
+        assert(p);
+
+        r = malloc(l);
+        if (!r)
+                return NULL;
+
+        memcpy(r, p, l);
+        return r;
+}
+
+void* greedy_realloc(void **p, size_t *allocated, size_t need, size_t size) {
+        size_t a, newalloc;
+        void *q;
+
+        assert(p);
+        assert(allocated);
+
+        if (*allocated >= need)
+                return *p;
+
+        newalloc = MAX(need * 2, 64u / size);
+        a = newalloc * size;
+
+        /* check for overflows */
+        if (a < size * need)
+                return NULL;
+
+        q = realloc(*p, a);
+        if (!q)
+                return NULL;
+
+        *p = q;
+        *allocated = newalloc;
+        return q;
+}
+
+void* greedy_realloc0(void **p, size_t *allocated, size_t need, size_t size) {
+        size_t prev;
+        uint8_t *q;
+
+        assert(p);
+        assert(allocated);
+
+        prev = *allocated;
+
+        q = greedy_realloc(p, allocated, need, size);
+        if (!q)
+                return NULL;
+
+        if (*allocated > prev)
+                memzero(q + prev * size, (*allocated - prev) * size);
+
+        return q;
+}

src/basic/alloc-util.h

@@ -0,0 +1,108 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#pragma once
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <alloca.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "macro.h"
+
+#define new(t, n) ((t*) malloc_multiply(sizeof(t), (n)))
+
+#define new0(t, n) ((t*) calloc((n), sizeof(t)))
+
+#define newa(t, n) ((t*) alloca(sizeof(t)*(n)))
+
+#define newa0(t, n) ((t*) alloca0(sizeof(t)*(n)))
+
+#define newdup(t, p, n) ((t*) memdup_multiply(p, sizeof(t), (n)))
+
+#define malloc0(n) (calloc(1, (n)))
+
+static inline void *mfree(void *memory) {
+        free(memory);
+        return NULL;
+}
+
+void* memdup(const void *p, size_t l) _alloc_(2);
+
+static inline void freep(void *p) {
+        free(*(void**) p);
+}
+
+#define _cleanup_free_ _cleanup_(freep)
+
+_malloc_  _alloc_(1, 2) static inline void *malloc_multiply(size_t a, size_t b) {
+        if (_unlikely_(b != 0 && a > ((size_t) -1) / b))
+                return NULL;
+
+        return malloc(a * b);
+}
+
+_alloc_(2, 3) static inline void *realloc_multiply(void *p, size_t a, size_t b) {
+        if (_unlikely_(b != 0 && a > ((size_t) -1) / b))
+                return NULL;
+
+        return realloc(p, a * b);
+}
+
+_alloc_(2, 3) static inline void *memdup_multiply(const void *p, size_t a, size_t b) {
+        if (_unlikely_(b != 0 && a > ((size_t) -1) / b))
+                return NULL;
+
+        return memdup(p, a * b);
+}
+
+void* greedy_realloc(void **p, size_t *allocated, size_t need, size_t size);
+void* greedy_realloc0(void **p, size_t *allocated, size_t need, size_t size);
+
+#define GREEDY_REALLOC(array, allocated, need)                          \
+        greedy_realloc((void**) &(array), &(allocated), (need), sizeof((array)[0]))
+
+#define GREEDY_REALLOC0(array, allocated, need)                         \
+        greedy_realloc0((void**) &(array), &(allocated), (need), sizeof((array)[0]))
+
+#define alloca0(n)                                      \
+        ({                                              \
+                char *_new_;                            \
+                size_t _len_ = n;                       \
+                _new_ = alloca(_len_);                  \
+                (void *) memset(_new_, 0, _len_);       \
+        })
+
+/* It's not clear what alignment glibc/gcc alloca() guarantee, hence provide a guaranteed safe version */
+#define alloca_align(size, align)                                       \
+        ({                                                              \
+                void *_ptr_;                                            \
+                size_t _mask_ = (align) - 1;                            \
+                _ptr_ = alloca((size) + _mask_);                        \
+                (void*)(((uintptr_t)_ptr_ + _mask_) & ~_mask_);         \
+        })
+
+#define alloca0_align(size, align)                                      \
+        ({                                                              \
+                void *_new_;                                            \
+                size_t _size_ = (size);                                 \
+                _new_ = alloca_align(_size_, (align));                  \
+                (void*)memset(_new_, 0, _size_);                        \
+        })

src/basic/audit-util.c

@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <stdio.h>
 
+#include "alloc-util.h"
 #include "audit-util.h"
 #include "fd-util.h"
 #include "fileio.h"

src/basic/bitmap.c

@@ -19,9 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "util.h"
-
+#include "alloc-util.h"
 #include "bitmap.h"
+#include "util.h"
 
 struct Bitmap {
         uint64_t *bitmaps;

src/basic/btrfs-util.c

@@ -26,6 +26,7 @@
 #include <linux/btrfs.h>
 #endif
 
+#include "alloc-util.h"
 #include "btrfs-ctree.h"
 #include "btrfs-util.h"
 #include "copy.h"

src/basic/bus-label.c

@@ -21,9 +21,10 @@
 
 #include <stdlib.h>
 
+#include "alloc-util.h"
 #include "bus-label.h"
-#include "macro.h"
 #include "hexdecoct.h"
+#include "macro.h"
 #include "util.h"
 
 char *bus_label_escape(const char *s) {

src/basic/calendarspec.c

@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "alloc-util.h"
 #include "string-util.h"
 #include "calendarspec.h"
 #include "fileio.h"

src/basic/capability-util.c

@@ -26,6 +26,7 @@
 #include <sys/prctl.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "capability-util.h"
 #include "fileio.h"
 #include "log.h"

src/basic/cgroup-util.c

@@ -29,6 +29,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "cgroup-util.h"
 #include "dirent-util.h"
 #include "extract-word.h"

src/basic/copy.c

@@ -22,6 +22,7 @@
 #include <sys/sendfile.h>
 #include <sys/xattr.h>
 
+#include "alloc-util.h"
 #include "btrfs-util.h"
 #include "chattr-util.h"
 #include "copy.h"

src/basic/cpu-set-util.c

@@ -20,6 +20,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
 #include "cpu-set-util.h"
 #include "extract-word.h"
 #include "parse-util.h"

src/basic/env-util.c

@@ -22,12 +22,13 @@
 #include <limits.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "def.h"
+#include "env-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "utf8.h"
 #include "util.h"
-#include "env-util.h"
 
 #define VALID_CHARS_ENV_NAME                    \
         DIGITS LETTERS                          \

src/basic/escape.c

@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
 #include "escape.h"
 #include "hexdecoct.h"
 #include "utf8.h"

src/basic/extract-word.c

@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
 #include "escape.h"
 #include "utf8.h"
 #include "util.h"

src/basic/fileio.c

@@ -21,6 +21,7 @@
 
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "ctype.h"
 #include "escape.h"
 #include "fd-util.h"

src/basic/fs-util.c

@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fileio.h"

src/basic/hashmap.c

@@ -24,6 +24,7 @@
 #include <pthread.h>
 #include <stdlib.h>
 
+#include "alloc-util.h"
 #include "hashmap.h"
 #include "macro.h"
 #include "mempool.h"

src/basic/hexdecoct.c

@@ -22,6 +22,7 @@
 #include <ctype.h>
 #include <inttypes.h>
 
+#include "alloc-util.h"
 #include "hexdecoct.h"
 #include "util.h"
 

src/basic/in-addr-util.c

@@ -21,6 +21,7 @@
 
 #include <arpa/inet.h>
 
+#include "alloc-util.h"
 #include "in-addr-util.h"
 
 int in_addr_is_null(int family, const union in_addr_union *u) {

src/basic/json.c

@@ -22,6 +22,7 @@
 #include <math.h>
 #include <sys/types.h>
 
+#include "alloc-util.h"
 #include "json.h"
 #include "macro.h"
 #include "hexdecoct.h"

src/basic/lockfile-util.c

@@ -27,6 +27,7 @@
 #include <limits.h>
 #include <sys/file.h>
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"

src/basic/log.c

@@ -31,6 +31,7 @@
 
 #include "sd-messages.h"
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "formats-util.h"
 #include "io-util.h"

src/basic/memfd-util.c

@@ -27,6 +27,7 @@
 #include <sys/mman.h>
 #include <sys/prctl.h>
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "memfd-util.h"
 #include "missing.h"

src/basic/mount-util.c

@@ -23,6 +23,7 @@
 #include <sys/mount.h>
 #include <sys/statvfs.h>
 
+#include "alloc-util.h"
 #include "escape.h"
 #include "fd-util.h"
 #include "fileio.h"

src/basic/path-util.c

@@ -33,6 +33,7 @@
 #include <libgen.h>
 #undef basename
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"

src/basic/prioq.c

@@ -29,8 +29,9 @@
  * The underlying algorithm used in this implementation is a Heap.
  */
 
-#include "util.h"
+#include "alloc-util.h"
 #include "prioq.h"
+#include "util.h"
 
 struct prioq_item {
         void *data;

src/basic/proc-cmdline.c

@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
 #include "extract-word.h"
 #include "fileio.h"
 #include "macro.h"

src/basic/process-util.c

@@ -28,6 +28,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "escape.h"
 #include "fd-util.h"
 #include "fileio.h"

src/basic/replace-var.c

@@ -21,6 +21,7 @@
 
 #include <string.h>
 
+#include "alloc-util.h"
 #include "macro.h"
 #include "util.h"
 #include "replace-var.h"

src/basic/selinux-util.c

@@ -29,6 +29,7 @@
 #include <selinux/context.h>
 #endif
 
+#include "alloc-util.h"
 #include "strv.h"
 #include "path-util.h"
 #include "selinux-util.h"

src/basic/smack-util.c

@@ -23,6 +23,7 @@
 
 #include <sys/xattr.h>
 
+#include "alloc-util.h"
 #include "fileio.h"
 #include "path-util.h"
 #include "process-util.h"

src/basic/socket-label.c

@@ -25,6 +25,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "macro.h"
 #include "missing.h"

src/basic/socket-util.c

@@ -30,6 +30,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "formats-util.h"

src/basic/strbuf.c

@@ -22,8 +22,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "util.h"
+#include "alloc-util.h"
 #include "strbuf.h"
+#include "util.h"
 
 /*
  * Strbuf stores given strings in a single continuous allocated memory

src/basic/string-util.c

@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
 #include "gunicode.h"
 #include "utf8.h"
 #include "util.h"

src/basic/strv.c

@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "alloc-util.h"
 #include "escape.h"
 #include "string-util.h"
 #include "util.h"

src/basic/terminal-util.c

@@ -31,6 +31,7 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"

src/basic/time-util.c

@@ -23,6 +23,7 @@
 #include <sys/timerfd.h>
 #include <sys/timex.h>
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"

src/basic/unit-name.c

@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <string.h>
 
+#include "alloc-util.h"
 #include "bus-label.h"
 #include "def.h"
 #include "hexdecoct.h"

src/basic/user-util.c

@@ -22,6 +22,7 @@
 #include <pwd.h>
 #include <grp.h>
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "macro.h"
 #include "parse-util.h"

src/basic/utf8.c

@@ -49,6 +49,7 @@
 #include <string.h>
 #include <stdbool.h>
 
+#include "alloc-util.h"
 #include "hexdecoct.h"
 #include "utf8.h"
 #include "util.h"

src/basic/util.c

@@ -69,6 +69,7 @@
  * otherwise conflicts with sys/mount.h. Yay, Linux is great! */
 #include <linux/fs.h>
 
+#include "alloc-util.h"
 #include "build.h"
 #include "def.h"
 #include "device-nodes.h"
@@ -487,19 +488,6 @@ int prot_from_flags(int flags) {
         }
 }
 
-void* memdup(const void *p, size_t l) {
-        void *r;
-
-        assert(p);
-
-        r = malloc(l);
-        if (!r)
-                return NULL;
-
-        memcpy(r, p, l);
-        return r;
-}
-
 int fork_agent(pid_t *pid, const int except[], unsigned n_except, const char *path, ...) {
         bool stdout_is_tty, stderr_is_tty;
         pid_t parent_pid, agent_pid;
@@ -725,51 +713,6 @@ int on_ac_power(void) {
         return found_online || !found_offline;
 }
 
-void* greedy_realloc(void **p, size_t *allocated, size_t need, size_t size) {
-        size_t a, newalloc;
-        void *q;
-
-        assert(p);
-        assert(allocated);
-
-        if (*allocated >= need)
-                return *p;
-
-        newalloc = MAX(need * 2, 64u / size);
-        a = newalloc * size;
-
-        /* check for overflows */
-        if (a < size * need)
-                return NULL;
-
-        q = realloc(*p, a);
-        if (!q)
-                return NULL;
-
-        *p = q;
-        *allocated = newalloc;
-        return q;
-}
-
-void* greedy_realloc0(void **p, size_t *allocated, size_t need, size_t size) {
-        size_t prev;
-        uint8_t *q;
-
-        assert(p);
-        assert(allocated);
-
-        prev = *allocated;
-
-        q = greedy_realloc(p, allocated, need, size);
-        if (!q)
-                return NULL;
-
-        if (*allocated > prev)
-                memzero(q + prev * size, (*allocated - prev) * size);
-
-        return q;
-}
-
 bool id128_is_valid(const char *s) {
         size_t i, l;
 

src/basic/util.h

@@ -54,23 +54,6 @@
 size_t page_size(void) _pure_;
 #define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
 
-#define new(t, n) ((t*) malloc_multiply(sizeof(t), (n)))
-
-#define new0(t, n) ((t*) calloc((n), sizeof(t)))
-
-#define newa(t, n) ((t*) alloca(sizeof(t)*(n)))
-
-#define newa0(t, n) ((t*) alloca0(sizeof(t)*(n)))
-
-#define newdup(t, p, n) ((t*) memdup_multiply(p, sizeof(t), (n)))
-
-#define malloc0(n) (calloc(1, (n)))
-
-static inline void *mfree(void *memory) {
-        free(memory);
-        return NULL;
-}
-
 static inline const char* yes_no(bool b) {
         return b ? "yes" : "no";
 }
@@ -118,61 +101,36 @@ bool kexec_loaded(void);
 
 int prot_from_flags(int flags) _const_;
 
-void* memdup(const void *p, size_t l) _alloc_(2);
-
 int fork_agent(pid_t *pid, const int except[], unsigned n_except, const char *path, ...);
 
 bool in_initrd(void);
 
-static inline void freep(void *p) {
-        free(*(void**) p);
-}
-
-#define _cleanup_free_ _cleanup_(freep)
-
-_malloc_  _alloc_(1, 2) static inline void *malloc_multiply(size_t a, size_t b) {
-        if (_unlikely_(b != 0 && a > ((size_t) -1) / b))
-                return NULL;
-
-        return malloc(a * b);
-}
-
-_alloc_(2, 3) static inline void *realloc_multiply(void *p, size_t a, size_t b) {
-        if (_unlikely_(b != 0 && a > ((size_t) -1) / b))
-                return NULL;
-
-        return realloc(p, a * b);
-}
-
-_alloc_(2, 3) static inline void *memdup_multiply(const void *p, size_t a, size_t b) {
-        if (_unlikely_(b != 0 && a > ((size_t) -1) / b))
-                return NULL;
-
-        return memdup(p, a * b);
-}
-
 void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
                  int (*compar) (const void *, const void *, void *),
                  void *arg);
 
+/**
+ * Normal qsort requires base to be nonnull. Here were require
+ * that only if nmemb > 0.
+ */
+static inline void qsort_safe(void *base, size_t nmemb, size_t size, comparison_fn_t compar) {
+        if (nmemb <= 1)
+                return;
+
+        assert(base);
+        qsort(base, nmemb, size, compar);
+}
+
 int on_ac_power(void);
 
+#define memzero(x,l) (memset((x), 0, (l)))
+#define zero(x) (memzero(&(x), sizeof(x)))
+
 static inline void *mempset(void *s, int c, size_t n) {
         memset(s, c, n);
         return (uint8_t*)s + n;
 }
 
-#define memzero(x,l) (memset((x), 0, (l)))
-#define zero(x) (memzero(&(x), sizeof(x)))
-
-void* greedy_realloc(void **p, size_t *allocated, size_t need, size_t size);
-void* greedy_realloc0(void **p, size_t *allocated, size_t need, size_t size);
-#define GREEDY_REALLOC(array, allocated, need)                          \
-        greedy_realloc((void**) &(array), &(allocated), (need), sizeof((array)[0]))
-
-#define GREEDY_REALLOC0(array, allocated, need)                         \
-        greedy_realloc0((void**) &(array), &(allocated), (need), sizeof((array)[0]))
-
 static inline void _reset_errno_(int *saved_errno) {
         errno = *saved_errno;
 }
@@ -225,45 +183,8 @@ static inline unsigned log2u_round_up(unsigned x) {
         return log2u(x - 1) + 1;
 }
 
-#define alloca0(n)                                      \
-        ({                                              \
-                char *_new_;                            \
-                size_t _len_ = n;                       \
-                _new_ = alloca(_len_);                  \
-                (void *) memset(_new_, 0, _len_);       \
-        })
-
-/* It's not clear what alignment glibc/gcc alloca() guarantee, hence provide a guaranteed safe version */
-#define alloca_align(size, align)                                       \
-        ({                                                              \
-                void *_ptr_;                                            \
-                size_t _mask_ = (align) - 1;                            \
-                _ptr_ = alloca((size) + _mask_);                        \
-                (void*)(((uintptr_t)_ptr_ + _mask_) & ~_mask_);         \
-        })
-
-#define alloca0_align(size, align)                                      \
-        ({                                                              \
-                void *_new_;                                            \
-                size_t _size_ = (size);                                 \
-                _new_ = alloca_align(_size_, (align));                  \
-                (void*)memset(_new_, 0, _size_);                        \
-        })
-
 bool id128_is_valid(const char *s) _pure_;
 
-/**
- * Normal qsort requires base to be nonnull. Here were require
- * that only if nmemb > 0.
- */
-static inline void qsort_safe(void *base, size_t nmemb, size_t size, comparison_fn_t compar) {
-        if (nmemb <= 1)
-                return;
-
-        assert(base);
-        qsort(base, nmemb, size, compar);
-}
-
 int container_get_leader(const char *machine, pid_t *pid);
 
 int namespace_open(pid_t pid, int *pidns_fd, int *mntns_fd, int *netns_fd, int *userns_fd, int *root_fd);

src/basic/virt.c

@@ -23,9 +23,10 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "fileio.h"
-#include "stat-util.h"
 #include "process-util.h"
+#include "stat-util.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "util.h"

src/basic/xattr-util.c

@@ -21,6 +21,7 @@
 
 #include <sys/xattr.h>
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "sparse-endian.h"
 #include "stdio-util.h"

src/binfmt/binfmt.c

@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "alloc-util.h"
 #include "conf-files.h"
 #include "fd-util.h"
 #include "fileio.h"

src/boot/bootctl.c

@@ -37,6 +37,7 @@
 #include <sys/statfs.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "blkid-util.h"
 #include "efivars.h"
 #include "fd-util.h"

src/bootchart/bootchart.c

@@ -48,6 +48,7 @@
 
 #include "sd-journal.h"
 
+#include "alloc-util.h"
 #include "bootchart.h"
 #include "conf-parser.h"
 #include "fd-util.h"

src/bootchart/store.c

@@ -31,6 +31,7 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "bootchart.h"
 #include "cgroup-util.h"
 #include "dirent-util.h"

src/bootchart/svg.c

@@ -30,6 +30,7 @@
 #include <sys/utsname.h>
 #include <fcntl.h>
 
+#include "alloc-util.h"
 #include "architecture.h"
 #include "util.h"
 #include "fileio.h"

src/bus-proxyd/bus-proxyd.c

@@ -33,6 +33,7 @@
 
 #include "sd-daemon.h"
 
+#include "alloc-util.h"
 #include "bus-internal.h"
 #include "bus-xml-policy.h"
 #include "capability-util.h"

src/bus-proxyd/bus-xml-policy.c

@@ -21,6 +21,7 @@
 
 #include "sd-login.h"
 
+#include "alloc-util.h"
 #include "bus-internal.h"
 #include "bus-xml-policy.h"
 #include "conf-files.h"

src/bus-proxyd/driver.c

@@ -27,6 +27,7 @@
 
 #include "sd-bus.h"
 
+#include "alloc-util.h"
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-util.h"

src/bus-proxyd/proxy.c

@@ -31,6 +31,7 @@
 #include "sd-bus.h"
 #include "sd-daemon.h"
 
+#include "alloc-util.h"
 #include "bus-control.h"
 #include "bus-internal.h"
 #include "bus-message.h"

src/bus-proxyd/stdio-bridge.c

@@ -30,6 +30,7 @@
 #include "sd-daemon.h"
 #include "sd-bus.h"
 
+#include "alloc-util.h"
 #include "bus-internal.h"
 #include "bus-util.h"
 #include "def.h"

src/bus-proxyd/test-bus-xml-policy.c

@@ -25,6 +25,7 @@
 
 #include "sd-bus.h"
 
+#include "alloc-util.h"
 #include "bus-xml-policy.h"
 #include "log.h"
 #include "string-util.h"

src/cgls/cgls.c

@@ -27,6 +27,7 @@
 
 #include "sd-bus.h"
 
+#include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-util.h"
 #include "cgroup-show.h"

src/cgtop/cgtop.c

@@ -30,6 +30,7 @@
 
 #include "sd-bus.h"
 
+#include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-util.h"
 #include "cgroup-util.h"

src/core/automount.c

@@ -29,6 +29,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "async.h"
 #include "automount.h"
 #include "bus-error.h"

src/core/bus-endpoint.c

@@ -19,10 +19,11 @@
 
 #include <stdlib.h>
 
-#include "kdbus.h"
+#include "alloc-util.h"
+#include "bus-endpoint.h"
 #include "bus-kernel.h"
 #include "bus-policy.h"
-#include "bus-endpoint.h"
+#include "kdbus.h"
 
 int bus_kernel_set_endpoint_policy(int fd, uid_t uid, BusEndpoint *ep) {
 

src/core/bus-policy.c

@@ -19,6 +19,7 @@
 
 #include <stdlib.h>
 
+#include "alloc-util.h"
 #include "bus-kernel.h"
 #include "bus-policy.h"
 #include "kdbus.h"

src/core/busname.c

@@ -21,6 +21,7 @@
 
 #include <sys/mman.h>
 
+#include "alloc-util.h"
 #include "bus-internal.h"
 #include "bus-kernel.h"
 #include "bus-policy.h"

src/core/cgroup.c

@@ -22,6 +22,7 @@
 #include <fcntl.h>
 #include <fnmatch.h>
 
+#include "alloc-util.h"
 #include "cgroup-util.h"
 #include "cgroup.h"
 #include "fd-util.h"

src/core/dbus-cgroup.c

@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
 #include "bus-util.h"
 #include "cgroup-util.h"
 #include "cgroup.h"

src/core/dbus-execute.c

@@ -26,6 +26,7 @@
 #endif
 
 #include "af-list.h"
+#include "alloc-util.h"
 #include "bus-util.h"
 #include "capability-util.h"
 #include "dbus-execute.h"

src/core/dbus-job.c

@@ -21,12 +21,13 @@
 
 #include "sd-bus.h"
 
+#include "alloc-util.h"
+#include "dbus-job.h"
 #include "dbus.h"
 #include "job.h"
 #include "log.h"
 #include "selinux-access.h"
 #include "string-util.h"
-#include "dbus-job.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, job_type, JobType);
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_state, job_state, JobState);

src/core/dbus-manager.c

@@ -23,6 +23,7 @@
 #include <sys/prctl.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "architecture.h"
 #include "build.h"
 #include "bus-common-errors.h"

src/core/dbus-scope.c

@@ -19,17 +19,18 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "selinux-access.h"
-#include "unit.h"
-#include "scope.h"
-#include "dbus.h"
-#include "bus-util.h"
-#include "bus-internal.h"
+#include "alloc-util.h"
 #include "bus-common-errors.h"
-#include "dbus-unit.h"
+#include "bus-internal.h"
+#include "bus-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-kill.h"
 #include "dbus-scope.h"
+#include "dbus-unit.h"
+#include "dbus.h"
+#include "scope.h"
+#include "selinux-access.h"
+#include "unit.h"
 
 static int bus_scope_abandon(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         Scope *s = userdata;

src/core/dbus-service.c

@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
 #include "async.h"
 #include "bus-util.h"
 #include "dbus-cgroup.h"

src/core/dbus-socket.c

@@ -19,13 +19,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
 #include "bus-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
+#include "dbus-socket.h"
 #include "socket.h"
 #include "string-util.h"
 #include "unit.h"
-#include "dbus-socket.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, socket_result, SocketResult);
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_bind_ipv6_only, socket_address_bind_ipv6_only, SocketAddressBindIPv6Only);

src/core/dbus-timer.c

@@ -19,11 +19,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "unit.h"
-#include "timer.h"
-#include "dbus-timer.h"
+#include "alloc-util.h"
 #include "bus-util.h"
+#include "dbus-timer.h"
 #include "strv.h"
+#include "timer.h"
+#include "unit.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, timer_result, TimerResult);
 

src/core/dbus-unit.c

@@ -21,6 +21,7 @@
 
 #include "sd-bus.h"
 
+#include "alloc-util.h"
 #include "bus-common-errors.h"
 #include "cgroup-util.h"
 #include "dbus-unit.h"

src/core/dbus.c

@@ -25,6 +25,7 @@
 
 #include "sd-bus.h"
 
+#include "alloc-util.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-internal.h"

src/core/device.c

@@ -24,6 +24,7 @@
 
 #include "libudev.h"
 
+#include "alloc-util.h"
 #include "dbus-device.h"
 #include "device.h"
 #include "log.h"

src/core/execute.c

@@ -53,6 +53,7 @@
 #include "sd-messages.h"
 
 #include "af-list.h"
+#include "alloc-util.h"
 #ifdef HAVE_APPARMOR
 #include "apparmor-util.h"
 #endif

src/core/hostname-setup.c

@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "alloc-util.h"
 #include "fileio.h"
 #include "hostname-util.h"
 #include "log.h"

src/core/job.c

@@ -24,6 +24,7 @@
 #include "sd-id128.h"
 #include "sd-messages.h"
 
+#include "alloc-util.h"
 #include "async.h"
 #include "dbus-job.h"
 #include "dbus.h"

src/core/killall.c

@@ -24,6 +24,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "formats-util.h"
 #include "killall.h"

src/core/load-fragment.c

@@ -32,6 +32,7 @@
 #include <sys/resource.h>
 #include <sys/stat.h>
 
+#include "alloc-util.h"
 #include "af-list.h"
 #include "bus-error.h"
 #include "bus-internal.h"

src/core/machine-id-setup.c

@@ -29,6 +29,7 @@
 
 #include "sd-id128.h"
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"

src/core/main.c

@@ -40,6 +40,7 @@
 #include "sd-daemon.h"
 #include "sd-bus.h"
 
+#include "alloc-util.h"
 #include "architecture.h"
 #include "build.h"
 #include "bus-error.h"

src/core/manager.c

@@ -40,6 +40,7 @@
 #include "sd-daemon.h"
 #include "sd-messages.h"
 
+#include "alloc-util.h"
 #include "audit-fd.h"
 #include "boot-timestamps.h"
 #include "bus-common-errors.h"

src/core/mount-setup.c

@@ -25,6 +25,7 @@
 #include <unistd.h>
 #include <ftw.h>
 
+#include "alloc-util.h"
 #include "bus-util.h"
 #include "cgroup-util.h"
 #include "dev-setup.h"

src/core/mount.c

@@ -26,6 +26,7 @@
 
 #include "sd-messages.h"
 
+#include "alloc-util.h"
 #include "dbus-mount.h"
 #include "escape.h"
 #include "exit-status.h"
@@ -40,8 +41,8 @@
 #include "path-util.h"
 #include "smack-util.h"
 #include "special.h"
-#include "string-util.h"
 #include "string-table.h"
+#include "string-util.h"
 #include "strv.h"
 #include "unit-name.h"
 #include "unit.h"

src/core/namespace.c

@@ -28,6 +28,7 @@
 #include <unistd.h>
 #include <linux/fs.h>
 
+#include "alloc-util.h"
 #include "dev-setup.h"
 #include "fd-util.h"
 #include "loopback-setup.h"

src/core/scope.c

@@ -22,16 +22,17 @@
 #include <errno.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "dbus-scope.h"
 #include "load-dropin.h"
 #include "log.h"
+#include "scope.h"
 #include "special.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"
 #include "unit-name.h"
 #include "unit.h"
-#include "scope.h"
 
 static const UnitActiveState state_translation_table[_SCOPE_STATE_MAX] = {
         [SCOPE_DEAD] = UNIT_INACTIVE,

src/core/selinux-access.c

@@ -33,6 +33,7 @@
 
 #include "sd-bus.h"
 
+#include "alloc-util.h"
 #include "audit-fd.h"
 #include "bus-util.h"
 #include "log.h"

src/core/service.c

@@ -23,6 +23,7 @@
 #include <signal.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "async.h"
 #include "bus-error.h"
 #include "bus-kernel.h"

src/core/show-status.c

@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "io-util.h"
 #include "parse-util.h"

src/core/shutdown.c

@@ -31,6 +31,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "cgroup-util.h"
 #include "def.h"
 #include "fileio.h"

src/core/slice.c

@@ -21,6 +21,7 @@
 
 #include <errno.h>
 
+#include "alloc-util.h"
 #include "dbus-slice.h"
 #include "log.h"
 #include "special.h"

src/core/smack-setup.c

@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "alloc-util.h"
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fileio.h"

src/core/snapshot.c

@@ -21,6 +21,7 @@
 
 #include <errno.h>
 
+#include "alloc-util.h"
 #include "bus-common-errors.h"
 #include "dbus-snapshot.h"
 #include "parse-util.h"

src/core/socket.c

@@ -31,6 +31,7 @@
 
 #include "sd-event.h"
 
+#include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-util.h"
 #include "copy.h"

src/core/swap.c

@@ -26,6 +26,7 @@
 
 #include "libudev.h"
 
+#include "alloc-util.h"
 #include "dbus-swap.h"
 #include "escape.h"
 #include "exit-status.h"