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

27 files changed, 29 insertions, 2 deletions

diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
index e8931daee2..79f5a60579 100644
--- a/src/shared/acl-util.c
+++ b/src/shared/acl-util.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <stdbool.h>
 
+#include "alloc-util.h"
 #include "acl-util.h"
 #include "string-util.h"
 #include "strv.h"
diff --git a/src/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c
index b3d2f96885..8e36067f74 100644
--- a/src/shared/acpi-fpdt.c
+++ b/src/shared/acpi-fpdt.c
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "acpi-fpdt.h"
 #include "fd-util.h"
 #include "fileio.h"
diff --git a/src/shared/apparmor-util.c b/src/shared/apparmor-util.c
index 48d0f84995..f6ac43adfe 100644
--- a/src/shared/apparmor-util.c
+++ b/src/shared/apparmor-util.c
@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
 #include "apparmor-util.h"
 #include "fileio.h"
 #include "parse-util.h"
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index b2dbf98b8e..c96dbf877a 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -32,6 +32,7 @@
 #include <termios.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "ask-password-api.h"
 #include "fd-util.h"
 #include "fileio.h"
diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
index ff91c6bdc5..e605490c32 100644
--- a/src/shared/base-filesystem.c
+++ b/src/shared/base-filesystem.c
@@ -24,6 +24,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "base-filesystem.h"
 #include "fd-util.h"
 #include "log.h"
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 8f6278191a..f4a918063d 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -25,6 +25,7 @@
 #include "sd-daemon.h"
 #include "sd-event.h"
 
+#include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-internal.h"
 #include "bus-label.h"
diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c
index 9e70713ce8..129ffc7056 100644
--- a/src/shared/cgroup-show.c
+++ b/src/shared/cgroup-show.c
@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "alloc-util.h"
 #include "cgroup-show.h"
 #include "cgroup-util.h"
 #include "fd-util.h"
diff --git a/src/shared/condition.c b/src/shared/condition.c
index 2929e3e821..a69719116c 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -27,6 +27,7 @@
 
 #include "sd-id128.h"
 
+#include "alloc-util.h"
 #include "apparmor-util.h"
 #include "architecture.h"
 #include "audit-util.h"
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index fa13eb8075..163a83518b 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -26,6 +26,7 @@
 
 #include "sd-messages.h"
 
+#include "alloc-util.h"
 #include "conf-files.h"
 #include "conf-parser.h"
 #include "fd-util.h"
diff --git a/src/shared/dev-setup.c b/src/shared/dev-setup.c
index 0d321af967..ad3c17d5bd 100644
--- a/src/shared/dev-setup.c
+++ b/src/shared/dev-setup.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "dev-setup.h"
 #include "label.h"
 #include "path-util.h"
diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
index b6587306a5..7af15e0098 100644
--- a/src/shared/dns-domain.c
+++ b/src/shared/dns-domain.c
@@ -24,6 +24,7 @@
 #include <stringprep.h>
 #endif
 
+#include "alloc-util.h"
 #include "dns-domain.h"
 #include "hexdecoct.h"
 #include "parse-util.h"
diff --git a/src/shared/dropin.c b/src/shared/dropin.c
index 25400277ff..0d44401cc2 100644
--- a/src/shared/dropin.c
+++ b/src/shared/dropin.c
@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
 #include "conf-files.h"
 #include "dropin.h"
 #include "escape.h"
diff --git a/src/shared/efivars.c b/src/shared/efivars.c
index e7972d1574..86bb0b57c3 100644
--- a/src/shared/efivars.c
+++ b/src/shared/efivars.c
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <fcntl.h>
 
+#include "alloc-util.h"
 #include "dirent-util.h"
 #include "efivars.h"
 #include "fd-util.h"
diff --git a/src/shared/firewall-util.c b/src/shared/firewall-util.c
index effc6e8e70..e178287872 100644
--- a/src/shared/firewall-util.c
+++ b/src/shared/firewall-util.c
@@ -27,8 +27,9 @@
 #include <linux/netfilter/xt_addrtype.h>
 #include <libiptc/libiptc.h>
 
-#include "util.h"
+#include "alloc-util.h"
 #include "firewall-util.h"
+#include "util.h"
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct xtc_handle*, iptc_free);
 
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index 1ea11ea5a4..eb2845cddf 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
 #include "device-nodes.h"
 #include "fstab-util.h"
 #include "mount-util.h"
diff --git a/src/shared/generator.c b/src/shared/generator.c
index 203e01318b..cb4ebc606e 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -21,6 +21,7 @@
 
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "dropin.h"
 #include "escape.h"
 #include "fd-util.h"
diff --git a/src/shared/import-util.c b/src/shared/import-util.c
index bf5395dee8..ddc8c00a2d 100644
--- a/src/shared/import-util.c
+++ b/src/shared/import-util.c
@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
 #include "btrfs-util.h"
 #include "import-util.h"
 #include "path-util.h"
diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c
index 224874f65c..e1cb5d27ff 100644
--- a/src/shared/install-printf.c
+++ b/src/shared/install-printf.c
@@ -21,6 +21,7 @@
 
 #include <stdlib.h>
 
+#include "alloc-util.h"
 #include "formats-util.h"
 #include "install-printf.h"
 #include "specifier.h"
diff --git a/src/shared/install.c b/src/shared/install.c
index 1f63ae9ce0..c74efede76 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "conf-files.h"
 #include "conf-parser.h"
 #include "dirent-util.h"
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 5b4a220e5f..0313b0946f 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -25,6 +25,7 @@
 #include <sys/socket.h>
 #include <time.h>
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "formats-util.h"
 #include "hashmap.h"
diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
index a4e77fb8d8..2c1da0a40d 100644
--- a/src/shared/machine-image.c
+++ b/src/shared/machine-image.c
@@ -23,6 +23,7 @@
 #include <linux/fs.h>
 #include <sys/statfs.h>
 
+#include "alloc-util.h"
 #include "btrfs-util.h"
 #include "chattr-util.h"
 #include "copy.h"
diff --git a/src/shared/machine-pool.c b/src/shared/machine-pool.c
index 1c7e0ef2c1..60b1b3092d 100644
--- a/src/shared/machine-pool.c
+++ b/src/shared/machine-pool.c
@@ -24,6 +24,7 @@
 #include <sys/statvfs.h>
 #include <sys/vfs.h>
 
+#include "alloc-util.h"
 #include "btrfs-util.h"
 #include "fd-util.h"
 #include "fileio.h"
diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index 1e63c72047..d71f379e76 100644
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <errno.h>
 
+#include "alloc-util.h"
 #include "util.h"
 #include "strv.h"
 #include "path-util.h"
diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c
index e5e0f37adf..786752ea94 100644
--- a/src/shared/ptyfwd.c
+++ b/src/shared/ptyfwd.c
@@ -24,6 +24,7 @@
 #include <limits.h>
 #include <termios.h>
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "ptyfwd.h"
 #include "util.h"
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index 0e232e6aa6..bbbb3460d4 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -21,6 +21,7 @@
 
 #include <stdio.h>
 
+#include "alloc-util.h"
 #include "conf-parser.h"
 #include "fd-util.h"
 #include "fileio.h"
diff --git a/src/shared/specifier.c b/src/shared/specifier.c
index 610aec0df5..c5c4a4d7d7 100644
--- a/src/shared/specifier.c
+++ b/src/shared/specifier.c
@@ -22,11 +22,12 @@
 #include <string.h>
 #include <sys/utsname.h>
 
+#include "alloc-util.h"
 #include "hostname-util.h"
 #include "macro.h"
+#include "specifier.h"
 #include "string-util.h"
 #include "util.h"
-#include "specifier.h"
 
 /*
  * Generic infrastructure for replacing %x style specifiers in
diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c
index 1e6ac2f27d..13b32a0509 100644
--- a/src/shared/utmp-wtmp.c
+++ b/src/shared/utmp-wtmp.c
@@ -27,6 +27,7 @@
 #include <unistd.h>
 #include <utmpx.h>
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "hostname-util.h"
 #include "macro.h"