From b5efdb8af40ea759a1ea584c1bc44ecc81dd00ce Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 27 Oct 2015 03:01:06 +0100 Subject: [PATCH] util-lib: split out allocation calls into alloc-util.[ch] --- Makefile.am | 2 + src/activate/activate.c | 3 +- src/analyze/analyze-verify.c | 1 + src/analyze/analyze.c | 1 + src/backlight/backlight.c | 1 + src/basic/alloc-util.c | 81 +++++++++++++ src/basic/alloc-util.h | 108 +++++++++++++++++ src/basic/audit-util.c | 1 + src/basic/bitmap.c | 4 +- src/basic/btrfs-util.c | 1 + src/basic/bus-label.c | 3 +- src/basic/calendarspec.c | 1 + src/basic/capability-util.c | 1 + src/basic/cgroup-util.c | 1 + src/basic/copy.c | 1 + src/basic/cpu-set-util.c | 1 + src/basic/env-util.c | 3 +- src/basic/escape.c | 1 + src/basic/extract-word.c | 1 + src/basic/fileio.c | 1 + src/basic/fs-util.c | 1 + src/basic/hashmap.c | 1 + src/basic/hexdecoct.c | 1 + src/basic/in-addr-util.c | 1 + src/basic/json.c | 1 + src/basic/lockfile-util.c | 1 + src/basic/log.c | 1 + src/basic/memfd-util.c | 1 + src/basic/mount-util.c | 1 + src/basic/path-util.c | 1 + src/basic/prioq.c | 3 +- src/basic/proc-cmdline.c | 1 + src/basic/process-util.c | 1 + src/basic/replace-var.c | 1 + src/basic/selinux-util.c | 1 + src/basic/smack-util.c | 1 + src/basic/socket-label.c | 1 + src/basic/socket-util.c | 1 + src/basic/strbuf.c | 3 +- src/basic/string-util.c | 1 + src/basic/strv.c | 1 + src/basic/terminal-util.c | 1 + src/basic/time-util.c | 1 + src/basic/unit-name.c | 1 + src/basic/user-util.c | 1 + src/basic/utf8.c | 1 + src/basic/util.c | 59 +--------- src/basic/util.h | 109 +++--------------- src/basic/virt.c | 3 +- src/basic/xattr-util.c | 1 + src/binfmt/binfmt.c | 1 + src/boot/bootctl.c | 1 + src/bootchart/bootchart.c | 1 + src/bootchart/store.c | 1 + src/bootchart/svg.c | 1 + src/bus-proxyd/bus-proxyd.c | 1 + src/bus-proxyd/bus-xml-policy.c | 1 + src/bus-proxyd/driver.c | 1 + src/bus-proxyd/proxy.c | 1 + src/bus-proxyd/stdio-bridge.c | 1 + src/bus-proxyd/test-bus-xml-policy.c | 1 + src/cgls/cgls.c | 1 + src/cgtop/cgtop.c | 1 + src/core/automount.c | 1 + src/core/bus-endpoint.c | 5 +- src/core/bus-policy.c | 1 + src/core/busname.c | 1 + src/core/cgroup.c | 1 + src/core/dbus-cgroup.c | 1 + src/core/dbus-execute.c | 1 + src/core/dbus-job.c | 3 +- src/core/dbus-manager.c | 1 + src/core/dbus-scope.c | 15 +-- src/core/dbus-service.c | 1 + src/core/dbus-socket.c | 3 +- src/core/dbus-timer.c | 7 +- src/core/dbus-unit.c | 1 + src/core/dbus.c | 1 + src/core/device.c | 1 + src/core/execute.c | 1 + src/core/hostname-setup.c | 1 + src/core/job.c | 1 + src/core/killall.c | 1 + src/core/load-fragment.c | 1 + src/core/machine-id-setup.c | 1 + src/core/main.c | 1 + src/core/manager.c | 1 + src/core/mount-setup.c | 1 + src/core/mount.c | 3 +- src/core/namespace.c | 1 + src/core/scope.c | 3 +- src/core/selinux-access.c | 1 + src/core/service.c | 1 + src/core/show-status.c | 1 + src/core/shutdown.c | 1 + src/core/slice.c | 1 + src/core/smack-setup.c | 1 + src/core/snapshot.c | 1 + src/core/socket.c | 1 + src/core/swap.c | 1 + src/core/timer.c | 1 + src/core/transaction.c | 3 +- src/core/umount.c | 1 + src/core/unit-printf.c | 1 + src/core/unit.c | 1 + src/cryptsetup/cryptsetup-generator.c | 1 + src/cryptsetup/cryptsetup.c | 1 + src/dbus1-generator/dbus1-generator.c | 1 + src/debug-generator/debug-generator.c | 1 + src/delta/delta.c | 1 + src/escape/escape.c | 1 + src/firstboot/firstboot.c | 1 + src/fsck/fsck.c | 1 + src/fstab-generator/fstab-generator.c | 1 + src/getty-generator/getty-generator.c | 1 + src/gpt-auto-generator/gpt-auto-generator.c | 1 + .../hibernate-resume-generator.c | 1 + src/hibernate-resume/hibernate-resume.c | 3 +- src/hostname/hostnamectl.c | 1 + src/hostname/hostnamed.c | 1 + src/hwdb/hwdb.c | 1 + src/import/curl-util.c | 1 + src/import/export-raw.c | 1 + src/import/export-tar.c | 1 + src/import/export.c | 1 + src/import/import-raw.c | 1 + src/import/import-tar.c | 1 + src/import/import.c | 1 + src/import/importd.c | 1 + src/import/pull-common.c | 1 + src/import/pull-dkr.c | 1 + src/import/pull-job.c | 1 + src/import/pull-raw.c | 1 + src/import/pull-tar.c | 1 + src/import/pull.c | 1 + src/import/qcow2-util.c | 7 +- src/initctl/initctl.c | 1 + src/journal-remote/journal-gatewayd.c | 1 + src/journal-remote/journal-remote-parse.c | 1 + src/journal-remote/journal-remote-write.c | 1 + src/journal-remote/journal-remote.c | 1 + src/journal-remote/journal-upload-journal.c | 26 ++++- src/journal-remote/journal-upload.c | 1 + src/journal-remote/microhttpd-util.c | 1 + src/journal/catalog.c | 1 + src/journal/compress.c | 1 + src/journal/coredump-vacuum.c | 1 + src/journal/coredump.c | 1 + src/journal/coredumpctl.c | 1 + src/journal/journal-file.c | 1 + src/journal/journal-send.c | 1 + src/journal/journal-vacuum.c | 1 + src/journal/journal-verify.c | 1 + src/journal/journalctl.c | 1 + src/journal/journald-audit.c | 1 + src/journal/journald-console.c | 1 + src/journal/journald-native.c | 1 + src/journal/journald-rate-limit.c | 1 + src/journal/journald-server.c | 1 + src/journal/journald-stream.c | 1 + src/journal/journald-syslog.c | 1 + src/journal/journald-wall.c | 1 + src/journal/mmap-cache.c | 1 + src/journal/sd-journal.c | 1 + src/journal/stacktrace.c | 1 + src/journal/test-catalog.c | 1 + src/journal/test-compress-benchmark.c | 1 + src/journal/test-compress.c | 1 + src/journal/test-journal-flush.c | 1 + src/journal/test-journal-interleaving.c | 1 + src/journal/test-journal-match.c | 1 + src/journal/test-journal-stream.c | 1 + src/journal/test-journal-syslog.c | 1 + src/libsystemd-network/dhcp6-option.c | 10 +- src/libsystemd-network/lldp-internal.c | 1 + src/libsystemd-network/lldp-port.c | 1 + src/libsystemd-network/lldp-tlv.c | 3 +- src/libsystemd-network/network-internal.c | 1 + src/libsystemd-network/sd-dhcp-client.c | 1 + src/libsystemd-network/sd-dhcp-lease.c | 1 + src/libsystemd-network/sd-dhcp-server.c | 1 + src/libsystemd-network/sd-dhcp6-client.c | 1 + src/libsystemd-network/sd-dhcp6-lease.c | 6 +- src/libsystemd-network/sd-ipv4acd.c | 1 + src/libsystemd-network/sd-ipv4ll.c | 1 + src/libsystemd-network/sd-lldp.c | 1 + src/libsystemd-network/sd-ndisc.c | 1 + src/libsystemd-network/sd-pppoe.c | 1 + src/libsystemd-network/test-dhcp-client.c | 1 + src/libsystemd-network/test-dhcp-option.c | 8 +- src/libsystemd-network/test-ipv4ll-manual.c | 1 + src/libsystemd-network/test-lldp.c | 1 + src/libsystemd/sd-bus/bus-control.c | 1 + src/libsystemd/sd-bus/bus-creds.c | 1 + src/libsystemd/sd-bus/bus-dump.c | 1 + src/libsystemd/sd-bus/bus-error.c | 1 + src/libsystemd/sd-bus/bus-internal.c | 1 + src/libsystemd/sd-bus/bus-kernel.c | 1 + src/libsystemd/sd-bus/bus-match.c | 1 + src/libsystemd/sd-bus/bus-message.c | 1 + src/libsystemd/sd-bus/bus-objects.c | 1 + src/libsystemd/sd-bus/bus-slot.c | 1 + src/libsystemd/sd-bus/bus-socket.c | 1 + src/libsystemd/sd-bus/bus-track.c | 1 + src/libsystemd/sd-bus/busctl-introspect.c | 3 +- src/libsystemd/sd-bus/busctl.c | 1 + src/libsystemd/sd-bus/sd-bus.c | 1 + src/libsystemd/sd-bus/test-bus-benchmark.c | 1 + src/libsystemd/sd-bus/test-bus-chat.c | 1 + src/libsystemd/sd-bus/test-bus-gvariant.c | 1 + src/libsystemd/sd-bus/test-bus-kernel-bloom.c | 1 + src/libsystemd/sd-bus/test-bus-kernel.c | 1 + src/libsystemd/sd-bus/test-bus-marshal.c | 1 + src/libsystemd/sd-bus/test-bus-objects.c | 1 + src/libsystemd/sd-bus/test-bus-proxy.c | 1 + src/libsystemd/sd-bus/test-bus-zero-copy.c | 1 + src/libsystemd/sd-daemon/sd-daemon.c | 1 + src/libsystemd/sd-device/device-enumerator.c | 1 + src/libsystemd/sd-device/device-private.c | 1 + src/libsystemd/sd-device/sd-device.c | 1 + src/libsystemd/sd-event/sd-event.c | 1 + src/libsystemd/sd-hwdb/sd-hwdb.c | 1 + src/libsystemd/sd-login/sd-login.c | 1 + src/libsystemd/sd-login/test-login.c | 1 + src/libsystemd/sd-netlink/local-addresses.c | 2 + src/libsystemd/sd-netlink/netlink-message.c | 1 + src/libsystemd/sd-netlink/netlink-socket.c | 1 + src/libsystemd/sd-netlink/sd-netlink.c | 1 + .../sd-netlink/test-local-addresses.c | 1 + src/libsystemd/sd-network/network-util.c | 1 + src/libsystemd/sd-network/sd-network.c | 1 + src/libsystemd/sd-path/sd-path.c | 1 + src/libsystemd/sd-resolve/sd-resolve.c | 1 + src/libsystemd/sd-resolve/test-resolve.c | 1 + src/libudev/libudev-device.c | 1 + src/libudev/libudev-enumerate.c | 1 + src/libudev/libudev-hwdb.c | 1 + src/libudev/libudev-list.c | 5 +- src/libudev/libudev-monitor.c | 1 + src/libudev/libudev-queue.c | 1 + src/libudev/libudev.c | 1 + src/locale/localed.c | 1 + src/login/inhibit.c | 1 + src/login/loginctl.c | 1 + src/login/logind-acl.c | 1 + src/login/logind-action.c | 1 + src/login/logind-button.c | 1 + src/login/logind-core.c | 1 + src/login/logind-dbus.c | 1 + src/login/logind-device.c | 3 +- src/login/logind-inhibit.c | 1 + src/login/logind-seat-dbus.c | 1 + src/login/logind-seat.c | 1 + src/login/logind-session-dbus.c | 1 + src/login/logind-session-device.c | 1 + src/login/logind-session.c | 1 + src/login/logind-user-dbus.c | 1 + src/login/logind-user.c | 1 + src/login/logind-utmp.c | 1 + src/login/logind.c | 1 + src/login/pam_systemd.c | 1 + src/login/sysfs-show.c | 1 + src/machine/image-dbus.c | 1 + src/machine/machine-dbus.c | 1 + src/machine/machine.c | 1 + src/machine/machinectl.c | 1 + src/machine/machined-dbus.c | 1 + src/machine/machined.c | 1 + src/network/networkctl.c | 1 + src/network/networkd-address-pool.c | 1 + src/network/networkd-address.c | 1 + src/network/networkd-dhcp4.c | 5 +- src/network/networkd-fdb.c | 6 +- src/network/networkd-link-bus.c | 1 + src/network/networkd-link.c | 1 + src/network/networkd-manager-bus.c | 2 +- src/network/networkd-manager.c | 1 + src/network/networkd-netdev-bond.c | 1 + src/network/networkd-netdev-tuntap.c | 1 + src/network/networkd-netdev.c | 1 + src/network/networkd-network-bus.c | 1 + src/network/networkd-network.c | 1 + src/network/networkd-route.c | 1 + src/network/networkd-wait-online-link.c | 1 + src/network/networkd-wait-online-manager.c | 5 +- src/network/test-network.c | 1 + src/notify/notify.c | 1 + src/nspawn/nspawn-cgroup.c | 1 + src/nspawn/nspawn-expose-ports.c | 1 + src/nspawn/nspawn-mount.c | 1 + src/nspawn/nspawn-network.c | 1 + src/nspawn/nspawn-settings.c | 1 + src/nspawn/nspawn-setuid.c | 1 + src/nspawn/nspawn.c | 1 + src/nss-myhostname/nss-myhostname.c | 1 + src/nss-mymachines/nss-mymachines.c | 1 + src/path/path.c | 1 + src/random-seed/random-seed.c | 1 + src/rc-local-generator/rc-local-generator.c | 1 + src/resolve-host/resolve-host.c | 1 + src/resolve/resolved-bus.c | 2 +- src/resolve/resolved-conf.c | 6 +- src/resolve/resolved-dns-answer.c | 1 + src/resolve/resolved-dns-cache.c | 1 + src/resolve/resolved-dns-packet.c | 1 + src/resolve/resolved-dns-query.c | 4 +- src/resolve/resolved-dns-question.c | 3 +- src/resolve/resolved-dns-rr.c | 1 + src/resolve/resolved-dns-scope.c | 1 + src/resolve/resolved-dns-server.c | 4 +- src/resolve/resolved-dns-stream.c | 1 + src/resolve/resolved-dns-transaction.c | 1 + src/resolve/resolved-dns-zone.c | 1 + src/resolve/resolved-link.c | 1 + src/resolve/resolved-manager.c | 1 + src/rfkill/rfkill.c | 1 + src/run/run.c | 1 + src/shared/acl-util.c | 1 + src/shared/acpi-fpdt.c | 1 + src/shared/apparmor-util.c | 1 + src/shared/ask-password-api.c | 1 + src/shared/base-filesystem.c | 1 + src/shared/bus-util.c | 1 + src/shared/cgroup-show.c | 1 + src/shared/condition.c | 1 + src/shared/conf-parser.c | 1 + src/shared/dev-setup.c | 1 + src/shared/dns-domain.c | 1 + src/shared/dropin.c | 1 + src/shared/efivars.c | 1 + src/shared/firewall-util.c | 3 +- src/shared/fstab-util.c | 1 + src/shared/generator.c | 1 + src/shared/import-util.c | 1 + src/shared/install-printf.c | 1 + src/shared/install.c | 1 + src/shared/logs-show.c | 1 + src/shared/machine-image.c | 1 + src/shared/machine-pool.c | 1 + src/shared/path-lookup.c | 1 + src/shared/ptyfwd.c | 1 + src/shared/sleep-config.c | 1 + src/shared/specifier.c | 3 +- src/shared/utmp-wtmp.c | 1 + src/socket-proxy/socket-proxyd.c | 1 + src/systemctl/systemctl.c | 1 + src/sysusers/sysusers.c | 1 + src/sysv-generator/sysv-generator.c | 1 + src/test/test-calendarspec.c | 1 + src/test/test-cap-list.c | 1 + src/test/test-cgroup-util.c | 1 + src/test/test-condition.c | 1 + src/test/test-conf-files.c | 1 + src/test/test-copy.c | 1 + src/test/test-date.c | 3 +- src/test/test-device-nodes.c | 1 + src/test/test-dns-domain.c | 1 + src/test/test-ellipsize.c | 1 + src/test/test-fileio.c | 1 + src/test/test-fstab-util.c | 1 + src/test/test-hashmap-plain.c | 1 + src/test/test-hostname-util.c | 3 +- src/test/test-id128.c | 1 + src/test/test-json.c | 1 + src/test/test-namespace.c | 1 + src/test/test-path-util.c | 1 + src/test/test-path.c | 1 + src/test/test-prioq.c | 5 +- src/test/test-process-util.c | 1 + src/test/test-socket-util.c | 1 + src/test/test-strv.c | 1 + src/test/test-tmpfiles.c | 1 + src/test/test-uid-range.c | 1 + src/test/test-unit-file.c | 1 + src/test/test-unit-name.c | 1 + src/test/test-user-util.c | 1 + src/test/test-utf8.c | 1 + src/test/test-util.c | 1 + src/test/test-xml.c | 1 + src/timedate/timedated.c | 1 + src/timesync/timesyncd-conf.c | 5 +- src/timesync/timesyncd-manager.c | 1 + src/timesync/timesyncd-server.c | 1 + src/tmpfiles/tmpfiles.c | 1 + .../tty-ask-password-agent.c | 1 + src/udev/collect/collect.c | 1 + src/udev/net/link-config.c | 1 + src/udev/udev-builtin-blkid.c | 1 + src/udev/udev-builtin-hwdb.c | 1 + src/udev/udev-builtin-net_setup_link.c | 3 +- src/udev/udev-builtin-path_id.c | 1 + src/udev/udev-builtin-usb_id.c | 1 + src/udev/udev-ctrl.c | 1 + src/udev/udev-event.c | 1 + src/udev/udev-rules.c | 1 + src/udev/udevadm-hwdb.c | 1 + src/udev/udevd.c | 1 + src/update-utmp/update-utmp.c | 11 +- src/vconsole/vconsole-setup.c | 1 + 399 files changed, 691 insertions(+), 232 deletions(-) create mode 100644 src/basic/alloc-util.c create mode 100644 src/basic/alloc-util.h diff --git a/Makefile.am b/Makefile.am index 3c4250a144c..9250f8f2c54 100644 --- a/Makefile.am +++ b/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 = \ diff --git a/src/activate/activate.c b/src/activate/activate.c index 0e6ead310ef..b7e6255f490 100644 --- a/src/activate/activate.c +++ b/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; diff --git a/src/analyze/analyze-verify.c b/src/analyze/analyze-verify.c index 2b6240232c6..a377996a37a 100644 --- a/src/analyze/analyze-verify.c +++ b/src/analyze/analyze-verify.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "analyze-verify.h" #include "bus-util.h" #include "log.h" diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c index 7e63bfa8211..27ead903e93 100644 --- a/src/analyze/analyze.c +++ b/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" diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c index 9112ed328d9..08980fba823 100644 --- a/src/backlight/backlight.c +++ b/src/backlight/backlight.c @@ -21,6 +21,7 @@ #include "libudev.h" +#include "alloc-util.h" #include "def.h" #include "escape.h" #include "fileio.h" diff --git a/src/basic/alloc-util.c b/src/basic/alloc-util.c new file mode 100644 index 00000000000..48183e381f1 --- /dev/null +++ b/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 . +***/ + +#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; +} diff --git a/src/basic/alloc-util.h b/src/basic/alloc-util.h new file mode 100644 index 00000000000..12b602e1855 --- /dev/null +++ b/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 . +***/ + +#include +#include +#include + +#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_); \ + }) diff --git a/src/basic/audit-util.c b/src/basic/audit-util.c index 93d1adaf99d..46122973341 100644 --- a/src/basic/audit-util.c +++ b/src/basic/audit-util.c @@ -22,6 +22,7 @@ #include #include +#include "alloc-util.h" #include "audit-util.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/basic/bitmap.c b/src/basic/bitmap.c index 2eabf3e1c1b..1449e2ea852 100644 --- a/src/basic/bitmap.c +++ b/src/basic/bitmap.c @@ -19,9 +19,9 @@ along with systemd; If not, see . ***/ -#include "util.h" - +#include "alloc-util.h" #include "bitmap.h" +#include "util.h" struct Bitmap { uint64_t *bitmaps; diff --git a/src/basic/btrfs-util.c b/src/basic/btrfs-util.c index 7457e9f2181..4c90bc0c80b 100644 --- a/src/basic/btrfs-util.c +++ b/src/basic/btrfs-util.c @@ -26,6 +26,7 @@ #include #endif +#include "alloc-util.h" #include "btrfs-ctree.h" #include "btrfs-util.h" #include "copy.h" diff --git a/src/basic/bus-label.c b/src/basic/bus-label.c index 6f39528f138..c1534657ac9 100644 --- a/src/basic/bus-label.c +++ b/src/basic/bus-label.c @@ -21,9 +21,10 @@ #include +#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) { diff --git a/src/basic/calendarspec.c b/src/basic/calendarspec.c index 62b03a913c6..a6a906f453d 100644 --- a/src/basic/calendarspec.c +++ b/src/basic/calendarspec.c @@ -22,6 +22,7 @@ #include #include +#include "alloc-util.h" #include "string-util.h" #include "calendarspec.h" #include "fileio.h" diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c index 3a6ceed6f51..44792003063 100644 --- a/src/basic/capability-util.c +++ b/src/basic/capability-util.c @@ -26,6 +26,7 @@ #include #include +#include "alloc-util.h" #include "capability-util.h" #include "fileio.h" #include "log.h" diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 0f0e144b5e2..f7fc2c2c975 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -29,6 +29,7 @@ #include #include +#include "alloc-util.h" #include "cgroup-util.h" #include "dirent-util.h" #include "extract-word.h" diff --git a/src/basic/copy.c b/src/basic/copy.c index a3a4099b4d9..a187ae08fe6 100644 --- a/src/basic/copy.c +++ b/src/basic/copy.c @@ -22,6 +22,7 @@ #include #include +#include "alloc-util.h" #include "btrfs-util.h" #include "chattr-util.h" #include "copy.h" diff --git a/src/basic/cpu-set-util.c b/src/basic/cpu-set-util.c index cbeae0bf20a..9122ea5d484 100644 --- a/src/basic/cpu-set-util.c +++ b/src/basic/cpu-set-util.c @@ -20,6 +20,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "cpu-set-util.h" #include "extract-word.h" #include "parse-util.h" diff --git a/src/basic/env-util.c b/src/basic/env-util.c index a392af737cf..94cb2516983 100644 --- a/src/basic/env-util.c +++ b/src/basic/env-util.c @@ -22,12 +22,13 @@ #include #include +#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 \ diff --git a/src/basic/escape.c b/src/basic/escape.c index e763b5dac28..add0d7795bc 100644 --- a/src/basic/escape.c +++ b/src/basic/escape.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "escape.h" #include "hexdecoct.h" #include "utf8.h" diff --git a/src/basic/extract-word.c b/src/basic/extract-word.c index f2b74802fa4..c0f9394fadf 100644 --- a/src/basic/extract-word.c +++ b/src/basic/extract-word.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "escape.h" #include "utf8.h" #include "util.h" diff --git a/src/basic/fileio.c b/src/basic/fileio.c index 3dfd3af8af6..619dafb517e 100644 --- a/src/basic/fileio.c +++ b/src/basic/fileio.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "ctype.h" #include "escape.h" #include "fd-util.h" diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c index 6ad381afb41..7aee404bfcf 100644 --- a/src/basic/fs-util.c +++ b/src/basic/fs-util.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "dirent-util.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/basic/hashmap.c b/src/basic/hashmap.c index 015cc629b17..4109a08c6ca 100644 --- a/src/basic/hashmap.c +++ b/src/basic/hashmap.c @@ -24,6 +24,7 @@ #include #include +#include "alloc-util.h" #include "hashmap.h" #include "macro.h" #include "mempool.h" diff --git a/src/basic/hexdecoct.c b/src/basic/hexdecoct.c index f958582e68a..4eb566b15aa 100644 --- a/src/basic/hexdecoct.c +++ b/src/basic/hexdecoct.c @@ -22,6 +22,7 @@ #include #include +#include "alloc-util.h" #include "hexdecoct.h" #include "util.h" diff --git a/src/basic/in-addr-util.c b/src/basic/in-addr-util.c index d88864b5987..f4e24121e7b 100644 --- a/src/basic/in-addr-util.c +++ b/src/basic/in-addr-util.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "in-addr-util.h" int in_addr_is_null(int family, const union in_addr_union *u) { diff --git a/src/basic/json.c b/src/basic/json.c index efe635e20ec..716705e5ff5 100644 --- a/src/basic/json.c +++ b/src/basic/json.c @@ -22,6 +22,7 @@ #include #include +#include "alloc-util.h" #include "json.h" #include "macro.h" #include "hexdecoct.h" diff --git a/src/basic/lockfile-util.c b/src/basic/lockfile-util.c index 60235cc9723..87c3aef7afe 100644 --- a/src/basic/lockfile-util.c +++ b/src/basic/lockfile-util.c @@ -27,6 +27,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "fileio.h" #include "fs-util.h" diff --git a/src/basic/log.c b/src/basic/log.c index 505c0d072c5..1582fce61c7 100644 --- a/src/basic/log.c +++ b/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" diff --git a/src/basic/memfd-util.c b/src/basic/memfd-util.c index 9d638b27f08..92630f6b259 100644 --- a/src/basic/memfd-util.c +++ b/src/basic/memfd-util.c @@ -27,6 +27,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "memfd-util.h" #include "missing.h" diff --git a/src/basic/mount-util.c b/src/basic/mount-util.c index 24e88babcdc..fefa50709cc 100644 --- a/src/basic/mount-util.c +++ b/src/basic/mount-util.c @@ -23,6 +23,7 @@ #include #include +#include "alloc-util.h" #include "escape.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/basic/path-util.c b/src/basic/path-util.c index 3783129f695..ec90c432a4b 100644 --- a/src/basic/path-util.c +++ b/src/basic/path-util.c @@ -33,6 +33,7 @@ #include #undef basename +#include "alloc-util.h" #include "fd-util.h" #include "fileio.h" #include "fs-util.h" diff --git a/src/basic/prioq.c b/src/basic/prioq.c index d55b348c22f..75906989114 100644 --- a/src/basic/prioq.c +++ b/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; diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c index dd0e18ed6e7..dd91ce7dbcc 100644 --- a/src/basic/proc-cmdline.c +++ b/src/basic/proc-cmdline.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "extract-word.h" #include "fileio.h" #include "macro.h" diff --git a/src/basic/process-util.c b/src/basic/process-util.c index c5d7dc3089e..c534656c970 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c @@ -28,6 +28,7 @@ #include #include +#include "alloc-util.h" #include "escape.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/basic/replace-var.c b/src/basic/replace-var.c index 478fc43a388..18b49a9227d 100644 --- a/src/basic/replace-var.c +++ b/src/basic/replace-var.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "macro.h" #include "util.h" #include "replace-var.h" diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c index 7a7dc90e3c4..a821a3d5bb6 100644 --- a/src/basic/selinux-util.c +++ b/src/basic/selinux-util.c @@ -29,6 +29,7 @@ #include #endif +#include "alloc-util.h" #include "strv.h" #include "path-util.h" #include "selinux-util.h" diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c index a96fb5b5941..fcc046098dc 100644 --- a/src/basic/smack-util.c +++ b/src/basic/smack-util.c @@ -23,6 +23,7 @@ #include +#include "alloc-util.h" #include "fileio.h" #include "path-util.h" #include "process-util.h" diff --git a/src/basic/socket-label.c b/src/basic/socket-label.c index 4099ea6f9ff..e5d4efc719e 100644 --- a/src/basic/socket-label.c +++ b/src/basic/socket-label.c @@ -25,6 +25,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "macro.h" #include "missing.h" diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c index ef5b764e60c..1acab1ef95b 100644 --- a/src/basic/socket-util.c +++ b/src/basic/socket-util.c @@ -30,6 +30,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "fileio.h" #include "formats-util.h" diff --git a/src/basic/strbuf.c b/src/basic/strbuf.c index 01a076c2baf..f4f702a05ab 100644 --- a/src/basic/strbuf.c +++ b/src/basic/strbuf.c @@ -22,8 +22,9 @@ #include #include -#include "util.h" +#include "alloc-util.h" #include "strbuf.h" +#include "util.h" /* * Strbuf stores given strings in a single continuous allocated memory diff --git a/src/basic/string-util.c b/src/basic/string-util.c index a1781c505aa..63b9b79df9f 100644 --- a/src/basic/string-util.c +++ b/src/basic/string-util.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "gunicode.h" #include "utf8.h" #include "util.h" diff --git a/src/basic/strv.c b/src/basic/strv.c index f5df269006a..ba6df716a71 100644 --- a/src/basic/strv.c +++ b/src/basic/strv.c @@ -24,6 +24,7 @@ #include #include +#include "alloc-util.h" #include "escape.h" #include "string-util.h" #include "util.h" diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c index 7d694e4664e..b96bfcb8ef5 100644 --- a/src/basic/terminal-util.c +++ b/src/basic/terminal-util.c @@ -31,6 +31,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "fileio.h" #include "fs-util.h" diff --git a/src/basic/time-util.c b/src/basic/time-util.c index 867e7b2430a..9dc280efc65 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -23,6 +23,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "fileio.h" #include "fs-util.h" diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c index 43f52ce7c8e..0775ae7c14b 100644 --- a/src/basic/unit-name.c +++ b/src/basic/unit-name.c @@ -22,6 +22,7 @@ #include #include +#include "alloc-util.h" #include "bus-label.h" #include "def.h" #include "hexdecoct.h" diff --git a/src/basic/user-util.c b/src/basic/user-util.c index bdee77a7d28..d6c936db370 100644 --- a/src/basic/user-util.c +++ b/src/basic/user-util.c @@ -22,6 +22,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "macro.h" #include "parse-util.h" diff --git a/src/basic/utf8.c b/src/basic/utf8.c index de124abbdeb..7600d999032 100644 --- a/src/basic/utf8.c +++ b/src/basic/utf8.c @@ -49,6 +49,7 @@ #include #include +#include "alloc-util.h" #include "hexdecoct.h" #include "utf8.h" #include "util.h" diff --git a/src/basic/util.c b/src/basic/util.c index 6da311ad1e1..62d58c13fdf 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -69,6 +69,7 @@ * otherwise conflicts with sys/mount.h. Yay, Linux is great! */ #include +#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; diff --git a/src/basic/util.h b/src/basic/util.h index 3074029f38b..e2fceafd9a7 100644 --- a/src/basic/util.h +++ b/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,60 +101,35 @@ 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); -int on_ac_power(void); +/** + * 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; -static inline void *mempset(void *s, int c, size_t n) { - memset(s, c, n); - return (uint8_t*)s + n; + 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))) -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 *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) { 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); diff --git a/src/basic/virt.c b/src/basic/virt.c index 19f93b95aad..fb181e5b55e 100644 --- a/src/basic/virt.c +++ b/src/basic/virt.c @@ -23,9 +23,10 @@ #include #include +#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" diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c index 7351337c6b0..6abdaedc3e7 100644 --- a/src/basic/xattr-util.c +++ b/src/basic/xattr-util.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "fd-util.h" #include "sparse-endian.h" #include "stdio-util.h" diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c index b96695c353c..8e63153c927 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c @@ -27,6 +27,7 @@ #include #include +#include "alloc-util.h" #include "conf-files.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c index 332bb335455..4cf42d17f34 100644 --- a/src/boot/bootctl.c +++ b/src/boot/bootctl.c @@ -37,6 +37,7 @@ #include #include +#include "alloc-util.h" #include "blkid-util.h" #include "efivars.h" #include "fd-util.h" diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c index c0019174ab8..6723fa50986 100644 --- a/src/bootchart/bootchart.c +++ b/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" diff --git a/src/bootchart/store.c b/src/bootchart/store.c index e488c94b3b9..c1b1e77e447 100644 --- a/src/bootchart/store.c +++ b/src/bootchart/store.c @@ -31,6 +31,7 @@ #include #include +#include "alloc-util.h" #include "bootchart.h" #include "cgroup-util.h" #include "dirent-util.h" diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c index 43eca906188..05330c05779 100644 --- a/src/bootchart/svg.c +++ b/src/bootchart/svg.c @@ -30,6 +30,7 @@ #include #include +#include "alloc-util.h" #include "architecture.h" #include "util.h" #include "fileio.h" diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c index fc8edaeb36c..6a7134644fd 100644 --- a/src/bus-proxyd/bus-proxyd.c +++ b/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" diff --git a/src/bus-proxyd/bus-xml-policy.c b/src/bus-proxyd/bus-xml-policy.c index 1b9fdedca37..f0834e95257 100644 --- a/src/bus-proxyd/bus-xml-policy.c +++ b/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" diff --git a/src/bus-proxyd/driver.c b/src/bus-proxyd/driver.c index 4e859412f87..2e8bd83efde 100644 --- a/src/bus-proxyd/driver.c +++ b/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" diff --git a/src/bus-proxyd/proxy.c b/src/bus-proxyd/proxy.c index 6c251b52445..db399b24f26 100644 --- a/src/bus-proxyd/proxy.c +++ b/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" diff --git a/src/bus-proxyd/stdio-bridge.c b/src/bus-proxyd/stdio-bridge.c index a009ea76c4f..6e478842093 100644 --- a/src/bus-proxyd/stdio-bridge.c +++ b/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" diff --git a/src/bus-proxyd/test-bus-xml-policy.c b/src/bus-proxyd/test-bus-xml-policy.c index cb7ff6b9700..1f465edd917 100644 --- a/src/bus-proxyd/test-bus-xml-policy.c +++ b/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" diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c index 41c539a1bc5..4e9a76a100d 100644 --- a/src/cgls/cgls.c +++ b/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" diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c index 43b8af44203..eea8aea76bc 100644 --- a/src/cgtop/cgtop.c +++ b/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" diff --git a/src/core/automount.c b/src/core/automount.c index 50a77727535..715e52e7947 100644 --- a/src/core/automount.c +++ b/src/core/automount.c @@ -29,6 +29,7 @@ #include #include +#include "alloc-util.h" #include "async.h" #include "automount.h" #include "bus-error.h" diff --git a/src/core/bus-endpoint.c b/src/core/bus-endpoint.c index 0c4b3e7c8b6..d22a80c91fa 100644 --- a/src/core/bus-endpoint.c +++ b/src/core/bus-endpoint.c @@ -19,10 +19,11 @@ #include -#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) { diff --git a/src/core/bus-policy.c b/src/core/bus-policy.c index 7ad18fb28c1..4907c268e8c 100644 --- a/src/core/bus-policy.c +++ b/src/core/bus-policy.c @@ -19,6 +19,7 @@ #include +#include "alloc-util.h" #include "bus-kernel.h" #include "bus-policy.h" #include "kdbus.h" diff --git a/src/core/busname.c b/src/core/busname.c index 94674c99fa2..9fed54ffc8d 100644 --- a/src/core/busname.c +++ b/src/core/busname.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "bus-internal.h" #include "bus-kernel.h" #include "bus-policy.h" diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 0d37e69cd9e..90cee12be75 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -22,6 +22,7 @@ #include #include +#include "alloc-util.h" #include "cgroup-util.h" #include "cgroup.h" #include "fd-util.h" diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c index f424909b46d..3fd295baa91 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "bus-util.h" #include "cgroup-util.h" #include "cgroup.h" diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index 67405a16726..882a76e9889 100644 --- a/src/core/dbus-execute.c +++ b/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" diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c index e95ec5c0cbf..8c30d662500 100644 --- a/src/core/dbus-job.c +++ b/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); diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index 3f631bd9a0f..1f9f25093d3 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -23,6 +23,7 @@ #include #include +#include "alloc-util.h" #include "architecture.h" #include "build.h" #include "bus-common-errors.h" diff --git a/src/core/dbus-scope.c b/src/core/dbus-scope.c index f8fb373bf01..16375b2311b 100644 --- a/src/core/dbus-scope.c +++ b/src/core/dbus-scope.c @@ -19,17 +19,18 @@ along with systemd; If not, see . ***/ -#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; diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c index 91cdeb1f30b..c41b3e1723a 100644 --- a/src/core/dbus-service.c +++ b/src/core/dbus-service.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "async.h" #include "bus-util.h" #include "dbus-cgroup.h" diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c index 5941b72bc0b..be5ef261a65 100644 --- a/src/core/dbus-socket.c +++ b/src/core/dbus-socket.c @@ -19,13 +19,14 @@ along with systemd; If not, see . ***/ +#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); diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c index 8ea2cf84a49..a8a280d9612 100644 --- a/src/core/dbus-timer.c +++ b/src/core/dbus-timer.c @@ -19,11 +19,12 @@ along with systemd; If not, see . ***/ -#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); diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c index 10cd80389bd..6320cd1aa95 100644 --- a/src/core/dbus-unit.c +++ b/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" diff --git a/src/core/dbus.c b/src/core/dbus.c index bbab0aeddbe..834745aeb59 100644 --- a/src/core/dbus.c +++ b/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" diff --git a/src/core/device.c b/src/core/device.c index 90bb2c45fda..23ee7aee7ef 100644 --- a/src/core/device.c +++ b/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" diff --git a/src/core/execute.c b/src/core/execute.c index bf13e29bd9b..d751065af08 100644 --- a/src/core/execute.c +++ b/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 diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c index f1563afff90..cc7515905d5 100644 --- a/src/core/hostname-setup.c +++ b/src/core/hostname-setup.c @@ -23,6 +23,7 @@ #include #include +#include "alloc-util.h" #include "fileio.h" #include "hostname-util.h" #include "log.h" diff --git a/src/core/job.c b/src/core/job.c index 44532d0d5a9..120381fc3b6 100644 --- a/src/core/job.c +++ b/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" diff --git a/src/core/killall.c b/src/core/killall.c index dbfa90ebacb..77f145b4d1a 100644 --- a/src/core/killall.c +++ b/src/core/killall.c @@ -24,6 +24,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "formats-util.h" #include "killall.h" diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 72e918ed54c..c1d09e8e5a2 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -32,6 +32,7 @@ #include #include +#include "alloc-util.h" #include "af-list.h" #include "bus-error.h" #include "bus-internal.h" diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c index d00d3e94bbd..145ba2a28df 100644 --- a/src/core/machine-id-setup.c +++ b/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" diff --git a/src/core/main.c b/src/core/main.c index d9c888d747e..593b974566d 100644 --- a/src/core/main.c +++ b/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" diff --git a/src/core/manager.c b/src/core/manager.c index bf0cf069ca2..04111091e70 100644 --- a/src/core/manager.c +++ b/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" diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c index 1ab4ee5b1a8..b2596d1cd19 100644 --- a/src/core/mount-setup.c +++ b/src/core/mount-setup.c @@ -25,6 +25,7 @@ #include #include +#include "alloc-util.h" #include "bus-util.h" #include "cgroup-util.h" #include "dev-setup.h" diff --git a/src/core/mount.c b/src/core/mount.c index f04f3869303..68cf312fcaf 100644 --- a/src/core/mount.c +++ b/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" diff --git a/src/core/namespace.c b/src/core/namespace.c index 6c49ff32feb..81ba09ea5dd 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -28,6 +28,7 @@ #include #include +#include "alloc-util.h" #include "dev-setup.h" #include "fd-util.h" #include "loopback-setup.h" diff --git a/src/core/scope.c b/src/core/scope.c index 13de02cf16f..6bacb226e88 100644 --- a/src/core/scope.c +++ b/src/core/scope.c @@ -22,16 +22,17 @@ #include #include +#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, diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c index a9368ead22d..4bcdd273899 100644 --- a/src/core/selinux-access.c +++ b/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" diff --git a/src/core/service.c b/src/core/service.c index 54a420d6f09..2d92799fec4 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -23,6 +23,7 @@ #include #include +#include "alloc-util.h" #include "async.h" #include "bus-error.h" #include "bus-kernel.h" diff --git a/src/core/show-status.c b/src/core/show-status.c index 81166abf231..e4e12a33650 100644 --- a/src/core/show-status.c +++ b/src/core/show-status.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "fd-util.h" #include "io-util.h" #include "parse-util.h" diff --git a/src/core/shutdown.c b/src/core/shutdown.c index 93bbc315d36..3a95b5fd72c 100644 --- a/src/core/shutdown.c +++ b/src/core/shutdown.c @@ -31,6 +31,7 @@ #include #include +#include "alloc-util.h" #include "cgroup-util.h" #include "def.h" #include "fileio.h" diff --git a/src/core/slice.c b/src/core/slice.c index 8fb6d28a3cb..46021441503 100644 --- a/src/core/slice.c +++ b/src/core/slice.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "dbus-slice.h" #include "log.h" #include "special.h" diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c index b8cb9964a6a..0661ff9ecd5 100644 --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c @@ -28,6 +28,7 @@ #include #include +#include "alloc-util.h" #include "dirent-util.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/core/snapshot.c b/src/core/snapshot.c index da1c99ad12e..ba3135f401c 100644 --- a/src/core/snapshot.c +++ b/src/core/snapshot.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "bus-common-errors.h" #include "dbus-snapshot.h" #include "parse-util.h" diff --git a/src/core/socket.c b/src/core/socket.c index c145aa6081f..d8b8cf576aa 100644 --- a/src/core/socket.c +++ b/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" diff --git a/src/core/swap.c b/src/core/swap.c index cb2da1cb5c5..5be3c709bf0 100644 --- a/src/core/swap.c +++ b/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" diff --git a/src/core/timer.c b/src/core/timer.c index 47e501815ad..cc2afedabf7 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "bus-error.h" #include "bus-util.h" #include "dbus-timer.h" diff --git a/src/core/transaction.c b/src/core/transaction.c index d1c1b9a3cd3..69f28c902f6 100644 --- a/src/core/transaction.c +++ b/src/core/transaction.c @@ -22,10 +22,11 @@ #include #include +#include "alloc-util.h" #include "bus-common-errors.h" #include "bus-error.h" -#include "transaction.h" #include "terminal-util.h" +#include "transaction.h" static void transaction_unlink_job(Transaction *tr, Job *j, bool delete_dependencies); diff --git a/src/core/umount.c b/src/core/umount.c index 8735bed7b17..9d1f7660db7 100644 --- a/src/core/umount.c +++ b/src/core/umount.c @@ -29,6 +29,7 @@ #include "libudev.h" +#include "alloc-util.h" #include "escape.h" #include "fd-util.h" #include "fstab-util.h" diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c index 4a5c7efdb0e..721c8ccce9a 100644 --- a/src/core/unit-printf.c +++ b/src/core/unit-printf.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "cgroup-util.h" #include "formats-util.h" #include "macro.h" diff --git a/src/core/unit.c b/src/core/unit.c index 11d3bb9633c..8d56401231e 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -28,6 +28,7 @@ #include "sd-id128.h" #include "sd-messages.h" +#include "alloc-util.h" #include "bus-common-errors.h" #include "bus-util.h" #include "cgroup-util.h" diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c index 54a89452a35..ae53bac6009 100644 --- a/src/cryptsetup/cryptsetup-generator.c +++ b/src/cryptsetup/cryptsetup-generator.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "dropin.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index 8531b6b1251..98fe52a81bb 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -27,6 +27,7 @@ #include "sd-device.h" +#include "alloc-util.h" #include "ask-password-api.h" #include "device-util.h" #include "escape.h" diff --git a/src/dbus1-generator/dbus1-generator.c b/src/dbus1-generator/dbus1-generator.c index 66a0fe9ea22..b57bf9a57d3 100644 --- a/src/dbus1-generator/dbus1-generator.c +++ b/src/dbus1-generator/dbus1-generator.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "bus-internal.h" #include "bus-util.h" #include "cgroup-util.h" diff --git a/src/debug-generator/debug-generator.c b/src/debug-generator/debug-generator.c index 1a98cbaef87..e16c3b94533 100644 --- a/src/debug-generator/debug-generator.c +++ b/src/debug-generator/debug-generator.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "mkdir.h" #include "parse-util.h" #include "proc-cmdline.h" diff --git a/src/delta/delta.c b/src/delta/delta.c index 4ade23ffabc..6c25b185ed8 100644 --- a/src/delta/delta.c +++ b/src/delta/delta.c @@ -26,6 +26,7 @@ #include #include +#include "alloc-util.h" #include "dirent-util.h" #include "fd-util.h" #include "fs-util.h" diff --git a/src/escape/escape.c b/src/escape/escape.c index 9390558554e..e857affbc42 100644 --- a/src/escape/escape.c +++ b/src/escape/escape.c @@ -23,6 +23,7 @@ #include #include +#include "alloc-util.h" #include "log.h" #include "string-util.h" #include "strv.h" diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index 30ea942d142..46cfe9f8510 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -24,6 +24,7 @@ #include #include +#include "alloc-util.h" #include "ask-password-api.h" #include "copy.h" #include "fd-util.h" diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c index 4119edde309..5b806a1e691 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -32,6 +32,7 @@ #include "sd-bus.h" #include "sd-device.h" +#include "alloc-util.h" #include "bus-common-errors.h" #include "bus-error.h" #include "bus-util.h" diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index a51ecd9f7a5..f7c8d11ace1 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -25,6 +25,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "fileio.h" #include "fstab-util.h" diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c index 0997cc5faeb..03df7365b56 100644 --- a/src/getty-generator/getty-generator.c +++ b/src/getty-generator/getty-generator.c @@ -24,6 +24,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "fileio.h" #include "log.h" diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c index cc1bd3f50eb..5ea6c86898d 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -27,6 +27,7 @@ #include "libudev.h" #include "sd-id128.h" +#include "alloc-util.h" #include "blkid-util.h" #include "btrfs-util.h" #include "dirent-util.h" diff --git a/src/hibernate-resume/hibernate-resume-generator.c b/src/hibernate-resume/hibernate-resume-generator.c index 8c3a09501f0..da719f2a306 100644 --- a/src/hibernate-resume/hibernate-resume-generator.c +++ b/src/hibernate-resume/hibernate-resume-generator.c @@ -22,6 +22,7 @@ #include #include +#include "alloc-util.h" #include "fstab-util.h" #include "log.h" #include "mkdir.h" diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c index 1f3b1699056..316a2803d31 100644 --- a/src/hibernate-resume/hibernate-resume.c +++ b/src/hibernate-resume/hibernate-resume.c @@ -23,9 +23,10 @@ #include #include +#include "alloc-util.h" +#include "fileio.h" #include "log.h" #include "util.h" -#include "fileio.h" int main(int argc, char *argv[]) { struct stat st; diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c index 0724fcc16db..bf09fb8fbb3 100644 --- a/src/hostname/hostnamectl.c +++ b/src/hostname/hostnamectl.c @@ -28,6 +28,7 @@ #include "sd-bus.h" #include "sd-id128.h" +#include "alloc-util.h" #include "architecture.h" #include "bus-error.h" #include "bus-util.h" diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c index 5c63a025a33..92061532b8e 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c @@ -24,6 +24,7 @@ #include #include +#include "alloc-util.h" #include "bus-util.h" #include "def.h" #include "env-util.h" diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c index 48d0883a3a6..de59b797a6e 100644 --- a/src/hwdb/hwdb.c +++ b/src/hwdb/hwdb.c @@ -22,6 +22,7 @@ #include #include +#include "alloc-util.h" #include "conf-files.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/import/curl-util.c b/src/import/curl-util.c index 455fa1e07d6..4278466df12 100644 --- a/src/import/curl-util.c +++ b/src/import/curl-util.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "curl-util.h" #include "fd-util.h" #include "string-util.h" diff --git a/src/import/export-raw.c b/src/import/export-raw.c index 85e781a3085..103d45bf218 100644 --- a/src/import/export-raw.c +++ b/src/import/export-raw.c @@ -25,6 +25,7 @@ #include "sd-daemon.h" +#include "alloc-util.h" #include "btrfs-util.h" #include "copy.h" #include "export-raw.h" diff --git a/src/import/export-tar.c b/src/import/export-tar.c index 38e659a517e..2bbec661e66 100644 --- a/src/import/export-tar.c +++ b/src/import/export-tar.c @@ -21,6 +21,7 @@ #include "sd-daemon.h" +#include "alloc-util.h" #include "btrfs-util.h" #include "export-tar.h" #include "fd-util.h" diff --git a/src/import/export.c b/src/import/export.c index 6ff732d73f9..2b33d778d3b 100644 --- a/src/import/export.c +++ b/src/import/export.c @@ -23,6 +23,7 @@ #include "sd-event.h" +#include "alloc-util.h" #include "event-util.h" #include "export-raw.h" #include "export-tar.h" diff --git a/src/import/import-raw.c b/src/import/import-raw.c index 87f4a3935d5..2193d1d7f15 100644 --- a/src/import/import-raw.c +++ b/src/import/import-raw.c @@ -24,6 +24,7 @@ #include "sd-daemon.h" #include "sd-event.h" +#include "alloc-util.h" #include "btrfs-util.h" #include "chattr-util.h" #include "copy.h" diff --git a/src/import/import-tar.c b/src/import/import-tar.c index 64eb5ccd833..2ae1d881681 100644 --- a/src/import/import-tar.c +++ b/src/import/import-tar.c @@ -24,6 +24,7 @@ #include "sd-daemon.h" #include "sd-event.h" +#include "alloc-util.h" #include "btrfs-util.h" #include "copy.h" #include "fd-util.h" diff --git a/src/import/import.c b/src/import/import.c index 76b38e4903d..018b94d4c43 100644 --- a/src/import/import.c +++ b/src/import/import.c @@ -23,6 +23,7 @@ #include "sd-event.h" +#include "alloc-util.h" #include "event-util.h" #include "fd-util.h" #include "fs-util.h" diff --git a/src/import/importd.c b/src/import/importd.c index 65e23546403..4228681ceae 100644 --- a/src/import/importd.c +++ b/src/import/importd.c @@ -23,6 +23,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "bus-common-errors.h" #include "bus-util.h" #include "def.h" diff --git a/src/import/pull-common.c b/src/import/pull-common.c index c2358488215..d6567ba7eec 100644 --- a/src/import/pull-common.c +++ b/src/import/pull-common.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "btrfs-util.h" #include "capability-util.h" #include "copy.h" diff --git a/src/import/pull-dkr.c b/src/import/pull-dkr.c index 786651d581c..831470ff132 100644 --- a/src/import/pull-dkr.c +++ b/src/import/pull-dkr.c @@ -24,6 +24,7 @@ #include "sd-daemon.h" +#include "alloc-util.h" #include "aufs-util.h" #include "btrfs-util.h" #include "curl-util.h" diff --git a/src/import/pull-job.c b/src/import/pull-job.c index 3cc7ea10b7b..824fa246ec5 100644 --- a/src/import/pull-job.c +++ b/src/import/pull-job.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "fd-util.h" #include "hexdecoct.h" #include "io-util.h" diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c index c3476714c85..394131680d4 100644 --- a/src/import/pull-raw.c +++ b/src/import/pull-raw.c @@ -25,6 +25,7 @@ #include "sd-daemon.h" +#include "alloc-util.h" #include "btrfs-util.h" #include "chattr-util.h" #include "copy.h" diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c index 43b7b655869..26c0bc5866d 100644 --- a/src/import/pull-tar.c +++ b/src/import/pull-tar.c @@ -24,6 +24,7 @@ #include "sd-daemon.h" +#include "alloc-util.h" #include "btrfs-util.h" #include "copy.h" #include "curl-util.h" diff --git a/src/import/pull.c b/src/import/pull.c index 5e6cd50688f..39f5b2d8e44 100644 --- a/src/import/pull.c +++ b/src/import/pull.c @@ -23,6 +23,7 @@ #include "sd-event.h" +#include "alloc-util.h" #include "event-util.h" #include "hostname-util.h" #include "import-util.h" diff --git a/src/import/qcow2-util.c b/src/import/qcow2-util.c index fd3cf1b0e3b..47dabaa86ef 100644 --- a/src/import/qcow2-util.c +++ b/src/import/qcow2-util.c @@ -21,10 +21,11 @@ #include -#include "util.h" -#include "sparse-endian.h" -#include "qcow2-util.h" +#include "alloc-util.h" #include "btrfs-util.h" +#include "qcow2-util.h" +#include "sparse-endian.h" +#include "util.h" #define QCOW2_MAGIC 0x514649fb diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c index 2b374c02887..f1cf31a4a8f 100644 --- a/src/initctl/initctl.c +++ b/src/initctl/initctl.c @@ -28,6 +28,7 @@ #include "sd-bus.h" #include "sd-daemon.h" +#include "alloc-util.h" #include "bus-error.h" #include "bus-util.h" #include "def.h" diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c index b8a513bb749..6b93a758f65 100644 --- a/src/journal-remote/journal-gatewayd.c +++ b/src/journal-remote/journal-gatewayd.c @@ -33,6 +33,7 @@ #include "sd-daemon.h" #include "sd-journal.h" +#include "alloc-util.h" #include "bus-util.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c index db1636ac3e6..3ff40228a0d 100644 --- a/src/journal-remote/journal-remote-parse.c +++ b/src/journal-remote/journal-remote-parse.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "fd-util.h" #include "journal-remote-parse.h" #include "journald-native.h" diff --git a/src/journal-remote/journal-remote-write.c b/src/journal-remote/journal-remote-write.c index 40f4ff8e58c..d8250378b09 100644 --- a/src/journal-remote/journal-remote-write.c +++ b/src/journal-remote/journal-remote-write.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "journal-remote.h" int iovw_put(struct iovec_wrapper *iovw, void* data, size_t len) { diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index f70d278e1c0..a2c49b8b4d1 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -35,6 +35,7 @@ #include "sd-daemon.h" +#include "alloc-util.h" #include "conf-parser.h" #include "escape.h" #include "fd-util.h" diff --git a/src/journal-remote/journal-upload-journal.c b/src/journal-remote/journal-upload-journal.c index 6b3ad924a73..3ee6d32bf72 100644 --- a/src/journal-remote/journal-upload-journal.c +++ b/src/journal-remote/journal-upload-journal.c @@ -1,11 +1,33 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright 2014 Zbigniew Jędrzejewski-Szmek + + 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 . +***/ + #include #include -#include "util.h" +#include "alloc-util.h" +#include "journal-upload.h" #include "log.h" #include "utf8.h" -#include "journal-upload.h" +#include "util.h" /** * Write up to size bytes to buf. Return negative on error, and number of diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index 1925475db8b..7d274d2fc93 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -27,6 +27,7 @@ #include "sd-daemon.h" +#include "alloc-util.h" #include "conf-parser.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c index df068a089ca..b2c398a845b 100644 --- a/src/journal-remote/microhttpd-util.c +++ b/src/journal-remote/microhttpd-util.c @@ -29,6 +29,7 @@ #include #endif +#include "alloc-util.h" #include "log.h" #include "macro.h" #include "string-util.h" diff --git a/src/journal/catalog.c b/src/journal/catalog.c index 72d2bedc267..95a68574721 100644 --- a/src/journal/catalog.c +++ b/src/journal/catalog.c @@ -29,6 +29,7 @@ #include "sd-id128.h" +#include "alloc-util.h" #include "catalog.h" #include "conf-files.h" #include "fd-util.h" diff --git a/src/journal/compress.c b/src/journal/compress.c index 196d6ff4252..e1ca0a8818e 100644 --- a/src/journal/compress.c +++ b/src/journal/compress.c @@ -33,6 +33,7 @@ #include #endif +#include "alloc-util.h" #include "compress.h" #include "fd-util.h" #include "io-util.h" diff --git a/src/journal/coredump-vacuum.c b/src/journal/coredump-vacuum.c index 9635db19e19..39bc2e42709 100644 --- a/src/journal/coredump-vacuum.c +++ b/src/journal/coredump-vacuum.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "coredump-vacuum.h" #include "dirent-util.h" #include "fd-util.h" diff --git a/src/journal/coredump.c b/src/journal/coredump.c index f32e2d4a9f3..2e543537f6c 100644 --- a/src/journal/coredump.c +++ b/src/journal/coredump.c @@ -34,6 +34,7 @@ #include "sd-login.h" #include "acl-util.h" +#include "alloc-util.h" #include "capability-util.h" #include "cgroup-util.h" #include "compress.h" diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c index 07ca8dde0a5..af4d051138f 100644 --- a/src/journal/coredumpctl.c +++ b/src/journal/coredumpctl.c @@ -28,6 +28,7 @@ #include "sd-journal.h" +#include "alloc-util.h" #include "compress.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index 6f9b8a29150..12b39dbb278 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -28,6 +28,7 @@ #include #include +#include "alloc-util.h" #include "btrfs-util.h" #include "chattr-util.h" #include "compress.h" diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c index 8fe99fae99a..fa5dee73c31 100644 --- a/src/journal/journal-send.c +++ b/src/journal/journal-send.c @@ -31,6 +31,7 @@ #include "sd-journal.h" +#include "alloc-util.h" #include "fd-util.h" #include "fileio.h" #include "io-util.h" diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c index 87646922fb4..4b5fc76eb14 100644 --- a/src/journal/journal-vacuum.c +++ b/src/journal/journal-vacuum.c @@ -25,6 +25,7 @@ #include "sd-id128.h" +#include "alloc-util.h" #include "dirent-util.h" #include "fd-util.h" #include "journal-def.h" diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c index 5d000aedbbc..b78ce98b175 100644 --- a/src/journal/journal-verify.c +++ b/src/journal/journal-verify.c @@ -24,6 +24,7 @@ #include #include +#include "alloc-util.h" #include "compress.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 2782ac03294..a35783e3ff2 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -39,6 +39,7 @@ #include "sd-journal.h" #include "acl-util.h" +#include "alloc-util.h" #include "bus-error.h" #include "bus-util.h" #include "catalog.h" diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c index 6a8ef7dd405..3c13fe0d675 100644 --- a/src/journal/journald-audit.c +++ b/src/journal/journald-audit.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "audit-type.h" #include "fd-util.h" #include "hexdecoct.h" diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c index 72c4ba58796..860832cfc80 100644 --- a/src/journal/journald-console.c +++ b/src/journal/journald-console.c @@ -23,6 +23,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "fileio.h" #include "formats-util.h" diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c index 9f3b1e3b166..6fff4fe4733 100644 --- a/src/journal/journald-native.c +++ b/src/journal/journald-native.c @@ -24,6 +24,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "fs-util.h" #include "io-util.h" diff --git a/src/journal/journald-rate-limit.c b/src/journal/journald-rate-limit.c index 6e9557c06e6..434ddc8ac91 100644 --- a/src/journal/journald-rate-limit.c +++ b/src/journal/journald-rate-limit.c @@ -22,6 +22,7 @@ #include #include +#include "alloc-util.h" #include "hashmap.h" #include "list.h" #include "random-util.h" diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 03cc074e7a8..ecf7b7a4766 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -34,6 +34,7 @@ #include "sd-messages.h" #include "acl-util.h" +#include "alloc-util.h" #include "audit-util.h" #include "cgroup-util.h" #include "conf-parser.h" diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c index 0dd6d54d68b..5300c61c022 100644 --- a/src/journal/journald-stream.c +++ b/src/journal/journald-stream.c @@ -29,6 +29,7 @@ #include "sd-daemon.h" #include "sd-event.h" +#include "alloc-util.h" #include "dirent-util.h" #include "escape.h" #include "fd-util.h" diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c index 3553e9cc1d6..f3ac1a7ae06 100644 --- a/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c @@ -25,6 +25,7 @@ #include "sd-messages.h" +#include "alloc-util.h" #include "fd-util.h" #include "formats-util.h" #include "io-util.h" diff --git a/src/journal/journald-wall.c b/src/journal/journald-wall.c index 5284914941f..69540f11416 100644 --- a/src/journal/journald-wall.c +++ b/src/journal/journald-wall.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "formats-util.h" #include "journald-server.h" #include "process-util.h" diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c index 22f75540b83..3cb1dfa986a 100644 --- a/src/journal/mmap-cache.c +++ b/src/journal/mmap-cache.c @@ -23,6 +23,7 @@ #include #include +#include "alloc-util.h" #include "hashmap.h" #include "list.h" #include "log.h" diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c index bd93d907767..6eda5162c73 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -30,6 +30,7 @@ #include "sd-journal.h" +#include "alloc-util.h" #include "catalog.h" #include "compress.h" #include "dirent-util.h" diff --git a/src/journal/stacktrace.c b/src/journal/stacktrace.c index e32550d6448..4305462f809 100644 --- a/src/journal/stacktrace.c +++ b/src/journal/stacktrace.c @@ -22,6 +22,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "formats-util.h" #include "macro.h" diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c index c942df46a82..aea8fd15e6a 100644 --- a/src/journal/test-catalog.c +++ b/src/journal/test-catalog.c @@ -27,6 +27,7 @@ #include "sd-messages.h" +#include "alloc-util.h" #include "catalog.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/journal/test-compress-benchmark.c b/src/journal/test-compress-benchmark.c index 5a2f0564ca4..93ea9c6318f 100644 --- a/src/journal/test-compress-benchmark.c +++ b/src/journal/test-compress-benchmark.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "compress.h" #include "macro.h" #include "parse-util.h" diff --git a/src/journal/test-compress.c b/src/journal/test-compress.c index db4fa155541..b9d90a89887 100644 --- a/src/journal/test-compress.c +++ b/src/journal/test-compress.c @@ -17,6 +17,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "compress.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/journal/test-journal-flush.c b/src/journal/test-journal-flush.c index 6061623ae77..03d1522e235 100644 --- a/src/journal/test-journal-flush.c +++ b/src/journal/test-journal-flush.c @@ -23,6 +23,7 @@ #include "sd-journal.h" +#include "alloc-util.h" #include "journal-file.h" #include "journal-internal.h" #include "macro.h" diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c index 3c8b0268a4a..4ad89fe4b6a 100644 --- a/src/journal/test-journal-interleaving.c +++ b/src/journal/test-journal-interleaving.c @@ -25,6 +25,7 @@ #include "sd-journal.h" +#include "alloc-util.h" #include "journal-file.h" #include "journal-vacuum.h" #include "log.h" diff --git a/src/journal/test-journal-match.c b/src/journal/test-journal-match.c index 476477055af..abefedb992f 100644 --- a/src/journal/test-journal-match.c +++ b/src/journal/test-journal-match.c @@ -23,6 +23,7 @@ #include "sd-journal.h" +#include "alloc-util.h" #include "journal-internal.h" #include "log.h" #include "string-util.h" diff --git a/src/journal/test-journal-stream.c b/src/journal/test-journal-stream.c index b8482743a2c..0cbef4b8c56 100644 --- a/src/journal/test-journal-stream.c +++ b/src/journal/test-journal-stream.c @@ -24,6 +24,7 @@ #include "sd-journal.h" +#include "alloc-util.h" #include "journal-file.h" #include "journal-internal.h" #include "log.h" diff --git a/src/journal/test-journal-syslog.c b/src/journal/test-journal-syslog.c index de942c50cc8..1784187fe93 100644 --- a/src/journal/test-journal-syslog.c +++ b/src/journal/test-journal-syslog.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "journald-syslog.h" #include "macro.h" #include "string-util.h" diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c index f41bebced0f..076bb2dac05 100644 --- a/src/libsystemd-network/dhcp6-option.c +++ b/src/libsystemd-network/dhcp6-option.c @@ -23,14 +23,14 @@ #include #include -#include "sparse-endian.h" -#include "unaligned.h" -#include "util.h" -#include "strv.h" - +#include "alloc-util.h" #include "dhcp6-internal.h" #include "dhcp6-protocol.h" #include "dns-domain.h" +#include "sparse-endian.h" +#include "strv.h" +#include "unaligned.h" +#include "util.h" #define DHCP6_OPTION_IA_NA_LEN 12 #define DHCP6_OPTION_IA_TA_LEN 4 diff --git a/src/libsystemd-network/lldp-internal.c b/src/libsystemd-network/lldp-internal.c index 70061e914f3..583be2f55d9 100644 --- a/src/libsystemd-network/lldp-internal.c +++ b/src/libsystemd-network/lldp-internal.c @@ -22,6 +22,7 @@ #include "sd-lldp.h" +#include "alloc-util.h" #include "lldp-internal.h" /* We store maximum 1K chassis entries */ diff --git a/src/libsystemd-network/lldp-port.c b/src/libsystemd-network/lldp-port.c index 7486b4c38f2..97b6b485d26 100644 --- a/src/libsystemd-network/lldp-port.c +++ b/src/libsystemd-network/lldp-port.c @@ -20,6 +20,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "async.h" #include "lldp-port.h" #include "lldp-network.h" diff --git a/src/libsystemd-network/lldp-tlv.c b/src/libsystemd-network/lldp-tlv.c index 66af22e37dd..0851957ab45 100644 --- a/src/libsystemd-network/lldp-tlv.c +++ b/src/libsystemd-network/lldp-tlv.c @@ -23,8 +23,9 @@ #include #include -#include "macro.h" +#include "alloc-util.h" #include "lldp-tlv.h" +#include "macro.h" int tlv_section_new(tlv_section **ret) { tlv_section *s; diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c index d86977be179..52d76e443ec 100644 --- a/src/libsystemd-network/network-internal.c +++ b/src/libsystemd-network/network-internal.c @@ -25,6 +25,7 @@ #include "sd-ndisc.h" +#include "alloc-util.h" #include "condition.h" #include "conf-parser.h" #include "dhcp-lease-internal.h" diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c index a6d6a176e41..57fc8216c31 100644 --- a/src/libsystemd-network/sd-dhcp-client.c +++ b/src/libsystemd-network/sd-dhcp-client.c @@ -28,6 +28,7 @@ #include "sd-dhcp-client.h" +#include "alloc-util.h" #include "async.h" #include "dhcp-identifier.h" #include "dhcp-internal.h" diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c index 3411f6ec91c..c850538d743 100644 --- a/src/libsystemd-network/sd-dhcp-lease.c +++ b/src/libsystemd-network/sd-dhcp-lease.c @@ -26,6 +26,7 @@ #include "sd-dhcp-lease.h" +#include "alloc-util.h" #include "dhcp-lease-internal.h" #include "dhcp-protocol.h" #include "dns-domain.h" diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c index a2a8c16fc8a..8d0d9955c33 100644 --- a/src/libsystemd-network/sd-dhcp-server.c +++ b/src/libsystemd-network/sd-dhcp-server.c @@ -24,6 +24,7 @@ #include "sd-dhcp-server.h" +#include "alloc-util.h" #include "dhcp-internal.h" #include "dhcp-server-internal.h" #include "fd-util.h" diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c index 559c5e4df4d..e29de60d248 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c @@ -26,6 +26,7 @@ #include "sd-dhcp6-client.h" +#include "alloc-util.h" #include "dhcp-identifier.h" #include "dhcp6-internal.h" #include "dhcp6-lease-internal.h" diff --git a/src/libsystemd-network/sd-dhcp6-lease.c b/src/libsystemd-network/sd-dhcp6-lease.c index f34af6eabaa..3f32ba35e7f 100644 --- a/src/libsystemd-network/sd-dhcp6-lease.c +++ b/src/libsystemd-network/sd-dhcp6-lease.c @@ -22,11 +22,11 @@ #include -#include "strv.h" -#include "util.h" - +#include "alloc-util.h" #include "dhcp6-lease-internal.h" #include "dhcp6-protocol.h" +#include "strv.h" +#include "util.h" int dhcp6_lease_clear_timers(DHCP6IA *ia) { assert_return(ia, -EINVAL); diff --git a/src/libsystemd-network/sd-ipv4acd.c b/src/libsystemd-network/sd-ipv4acd.c index 3053724ea26..5340fdc0c1f 100644 --- a/src/libsystemd-network/sd-ipv4acd.c +++ b/src/libsystemd-network/sd-ipv4acd.c @@ -26,6 +26,7 @@ #include "sd-ipv4acd.h" +#include "alloc-util.h" #include "arp-util.h" #include "event-util.h" #include "fd-util.h" diff --git a/src/libsystemd-network/sd-ipv4ll.c b/src/libsystemd-network/sd-ipv4ll.c index 68ec58da901..0d915e20e7f 100644 --- a/src/libsystemd-network/sd-ipv4ll.c +++ b/src/libsystemd-network/sd-ipv4ll.c @@ -27,6 +27,7 @@ #include "sd-ipv4acd.h" #include "sd-ipv4ll.h" +#include "alloc-util.h" #include "event-util.h" #include "in-addr-util.h" #include "list.h" diff --git a/src/libsystemd-network/sd-lldp.c b/src/libsystemd-network/sd-lldp.c index bc06f483864..4ebe8053fa2 100644 --- a/src/libsystemd-network/sd-lldp.c +++ b/src/libsystemd-network/sd-lldp.c @@ -24,6 +24,7 @@ #include "sd-lldp.h" +#include "alloc-util.h" #include "fd-util.h" #include "fileio.h" #include "hashmap.h" diff --git a/src/libsystemd-network/sd-ndisc.c b/src/libsystemd-network/sd-ndisc.c index ca4bb6325b4..c494b9d6d8e 100644 --- a/src/libsystemd-network/sd-ndisc.c +++ b/src/libsystemd-network/sd-ndisc.c @@ -26,6 +26,7 @@ #include "sd-ndisc.h" +#include "alloc-util.h" #include "async.h" #include "icmp6-util.h" #include "list.h" diff --git a/src/libsystemd-network/sd-pppoe.c b/src/libsystemd-network/sd-pppoe.c index 03a88973bf1..045decc46c5 100644 --- a/src/libsystemd-network/sd-pppoe.c +++ b/src/libsystemd-network/sd-pppoe.c @@ -30,6 +30,7 @@ #include "sd-pppoe.h" +#include "alloc-util.h" #include "async.h" #include "event-util.h" #include "fd-util.h" diff --git a/src/libsystemd-network/test-dhcp-client.c b/src/libsystemd-network/test-dhcp-client.c index 40a85eb25ef..5b52c1cbb9b 100644 --- a/src/libsystemd-network/test-dhcp-client.c +++ b/src/libsystemd-network/test-dhcp-client.c @@ -27,6 +27,7 @@ #include "sd-dhcp-client.h" #include "sd-event.h" +#include "alloc-util.h" #include "dhcp-identifier.h" #include "dhcp-internal.h" #include "dhcp-protocol.h" diff --git a/src/libsystemd-network/test-dhcp-option.c b/src/libsystemd-network/test-dhcp-option.c index b1ef1748490..2d29e28f168 100644 --- a/src/libsystemd-network/test-dhcp-option.c +++ b/src/libsystemd-network/test-dhcp-option.c @@ -5,11 +5,11 @@ #include #include -#include "util.h" -#include "macro.h" - -#include "dhcp-protocol.h" +#include "alloc-util.h" #include "dhcp-internal.h" +#include "dhcp-protocol.h" +#include "macro.h" +#include "util.h" struct option_desc { uint8_t sname[64]; diff --git a/src/libsystemd-network/test-ipv4ll-manual.c b/src/libsystemd-network/test-ipv4ll-manual.c index 9485a7df64a..913a9290699 100644 --- a/src/libsystemd-network/test-ipv4ll-manual.c +++ b/src/libsystemd-network/test-ipv4ll-manual.c @@ -29,6 +29,7 @@ #include "sd-ipv4ll.h" #include "sd-netlink.h" +#include "alloc-util.h" #include "event-util.h" #include "in-addr-util.h" #include "netlink-util.h" diff --git a/src/libsystemd-network/test-lldp.c b/src/libsystemd-network/test-lldp.c index 109462662fc..931df7c170b 100644 --- a/src/libsystemd-network/test-lldp.c +++ b/src/libsystemd-network/test-lldp.c @@ -28,6 +28,7 @@ #include "sd-event.h" #include "sd-lldp.h" +#include "alloc-util.h" #include "event-util.h" #include "fd-util.h" #include "lldp-network.h" diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c index 5951db483df..d5bc32e757a 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/sd-bus/bus-control.c @@ -28,6 +28,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "bus-bloom.h" #include "bus-control.h" #include "bus-internal.h" diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c index 7c99904c642..2922da3763e 100644 --- a/src/libsystemd/sd-bus/bus-creds.c +++ b/src/libsystemd/sd-bus/bus-creds.c @@ -22,6 +22,7 @@ #include #include +#include "alloc-util.h" #include "audit-util.h" #include "bus-creds.h" #include "bus-label.h" diff --git a/src/libsystemd/sd-bus/bus-dump.c b/src/libsystemd/sd-bus/bus-dump.c index ab4e9cbc06f..43a7e67a6d5 100644 --- a/src/libsystemd/sd-bus/bus-dump.c +++ b/src/libsystemd/sd-bus/bus-dump.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "bus-dump.h" #include "bus-internal.h" #include "bus-message.h" diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c index 831ceb86b9f..84229c29640 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c @@ -28,6 +28,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "errno-list.h" #include "string-util.h" #include "util.h" diff --git a/src/libsystemd/sd-bus/bus-internal.c b/src/libsystemd/sd-bus/bus-internal.c index 8cab1bf2193..d9f9cd1c5e2 100644 --- a/src/libsystemd/sd-bus/bus-internal.c +++ b/src/libsystemd/sd-bus/bus-internal.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "bus-internal.h" #include "bus-message.h" #include "hexdecoct.h" diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index a32b0ef2218..6716f6daca8 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/sd-bus/bus-kernel.c @@ -34,6 +34,7 @@ #include #undef basename +#include "alloc-util.h" #include "bus-bloom.h" #include "bus-internal.h" #include "bus-kernel.h" diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c index 6a37f22c1f7..55dc7caa530 100644 --- a/src/libsystemd/sd-bus/bus-match.c +++ b/src/libsystemd/sd-bus/bus-match.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "bus-internal.h" #include "bus-match.h" #include "bus-message.h" diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c index d5a6ad581fe..5c80095bf09 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -25,6 +25,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "bus-gvariant.h" #include "bus-internal.h" #include "bus-message.h" diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c index d3679800b5f..8c472626a86 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "bus-internal.h" #include "bus-introspect.h" #include "bus-message.h" diff --git a/src/libsystemd/sd-bus/bus-slot.c b/src/libsystemd/sd-bus/bus-slot.c index 63f10eba2c9..550bad27ba6 100644 --- a/src/libsystemd/sd-bus/bus-slot.c +++ b/src/libsystemd/sd-bus/bus-slot.c @@ -21,6 +21,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "bus-control.h" #include "bus-objects.h" #include "string-util.h" diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c index 2c46d84cd08..a5cb667630a 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/sd-bus/bus-socket.c @@ -27,6 +27,7 @@ #include "sd-bus.h" #include "sd-daemon.h" +#include "alloc-util.h" #include "bus-internal.h" #include "bus-message.h" #include "bus-socket.h" diff --git a/src/libsystemd/sd-bus/bus-track.c b/src/libsystemd/sd-bus/bus-track.c index 0911156e195..fd7e58fcfac 100644 --- a/src/libsystemd/sd-bus/bus-track.c +++ b/src/libsystemd/sd-bus/bus-track.c @@ -21,6 +21,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "bus-internal.h" #include "bus-track.h" #include "bus-util.h" diff --git a/src/libsystemd/sd-bus/busctl-introspect.c b/src/libsystemd/sd-bus/busctl-introspect.c index 5604db97161..71f962b00cd 100644 --- a/src/libsystemd/sd-bus/busctl-introspect.c +++ b/src/libsystemd/sd-bus/busctl-introspect.c @@ -21,10 +21,11 @@ #include "sd-bus.h" +#include "alloc-util.h" +#include "busctl-introspect.h" #include "string-util.h" #include "util.h" #include "xml.h" -#include "busctl-introspect.h" #define NODE_DEPTH_MAX 16 diff --git a/src/libsystemd/sd-bus/busctl.c b/src/libsystemd/sd-bus/busctl.c index 4fa60bb1859..452ac7c407e 100644 --- a/src/libsystemd/sd-bus/busctl.c +++ b/src/libsystemd/sd-bus/busctl.c @@ -23,6 +23,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "bus-dump.h" #include "bus-internal.h" #include "bus-signature.h" diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 0d92a0d461a..a8d79b01b04 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -29,6 +29,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "bus-container.h" #include "bus-control.h" #include "bus-internal.h" diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c index 549c88cd2d6..96a0929a14c 100644 --- a/src/libsystemd/sd-bus/test-bus-benchmark.c +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c @@ -23,6 +23,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "bus-internal.h" #include "bus-kernel.h" #include "bus-util.h" diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c index e9e5e4a8e35..767aef63ffe 100644 --- a/src/libsystemd/sd-bus/test-bus-chat.c +++ b/src/libsystemd/sd-bus/test-bus-chat.c @@ -26,6 +26,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "bus-error.h" #include "bus-internal.h" #include "bus-match.h" diff --git a/src/libsystemd/sd-bus/test-bus-gvariant.c b/src/libsystemd/sd-bus/test-bus-gvariant.c index f94da4cccd7..931c001788d 100644 --- a/src/libsystemd/sd-bus/test-bus-gvariant.c +++ b/src/libsystemd/sd-bus/test-bus-gvariant.c @@ -25,6 +25,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "bus-dump.h" #include "bus-gvariant.h" #include "bus-internal.h" diff --git a/src/libsystemd/sd-bus/test-bus-kernel-bloom.c b/src/libsystemd/sd-bus/test-bus-kernel-bloom.c index ff7f9cdafa1..dbdaa69fbe7 100644 --- a/src/libsystemd/sd-bus/test-bus-kernel-bloom.c +++ b/src/libsystemd/sd-bus/test-bus-kernel-bloom.c @@ -21,6 +21,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "bus-kernel.h" #include "bus-util.h" #include "fd-util.h" diff --git a/src/libsystemd/sd-bus/test-bus-kernel.c b/src/libsystemd/sd-bus/test-bus-kernel.c index 7d05953cd0d..0080f71d3bf 100644 --- a/src/libsystemd/sd-bus/test-bus-kernel.c +++ b/src/libsystemd/sd-bus/test-bus-kernel.c @@ -23,6 +23,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "bus-dump.h" #include "bus-kernel.h" #include "bus-util.h" diff --git a/src/libsystemd/sd-bus/test-bus-marshal.c b/src/libsystemd/sd-bus/test-bus-marshal.c index 7da1dacd812..0747d6a37cb 100644 --- a/src/libsystemd/sd-bus/test-bus-marshal.c +++ b/src/libsystemd/sd-bus/test-bus-marshal.c @@ -32,6 +32,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "bus-dump.h" #include "bus-label.h" #include "bus-message.h" diff --git a/src/libsystemd/sd-bus/test-bus-objects.c b/src/libsystemd/sd-bus/test-bus-objects.c index 138db910ea4..5bc72e2355d 100644 --- a/src/libsystemd/sd-bus/test-bus-objects.c +++ b/src/libsystemd/sd-bus/test-bus-objects.c @@ -24,6 +24,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "bus-dump.h" #include "bus-internal.h" #include "bus-message.h" diff --git a/src/libsystemd/sd-bus/test-bus-proxy.c b/src/libsystemd/sd-bus/test-bus-proxy.c index ae04ff5b0d1..428e1857694 100644 --- a/src/libsystemd/sd-bus/test-bus-proxy.c +++ b/src/libsystemd/sd-bus/test-bus-proxy.c @@ -25,6 +25,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "bus-dump.h" #include "bus-kernel.h" #include "bus-util.h" diff --git a/src/libsystemd/sd-bus/test-bus-zero-copy.c b/src/libsystemd/sd-bus/test-bus-zero-copy.c index 1be0dbcd827..ff8df61a9e6 100644 --- a/src/libsystemd/sd-bus/test-bus-zero-copy.c +++ b/src/libsystemd/sd-bus/test-bus-zero-copy.c @@ -23,6 +23,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "bus-dump.h" #include "bus-kernel.h" #include "bus-message.h" diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c index 49fac7bdccf..77b5dd52f6e 100644 --- a/src/libsystemd/sd-daemon/sd-daemon.c +++ b/src/libsystemd/sd-daemon/sd-daemon.c @@ -35,6 +35,7 @@ #include "sd-daemon.h" +#include "alloc-util.h" #include "fd-util.h" #include "fs-util.h" #include "parse-util.h" diff --git a/src/libsystemd/sd-device/device-enumerator.c b/src/libsystemd/sd-device/device-enumerator.c index e1eb5b26b3a..ae3157ee5ee 100644 --- a/src/libsystemd/sd-device/device-enumerator.c +++ b/src/libsystemd/sd-device/device-enumerator.c @@ -20,6 +20,7 @@ #include "sd-device.h" +#include "alloc-util.h" #include "device-enumerator-private.h" #include "device-util.h" #include "dirent-util.h" diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c index 69288b833e0..a13477e7533 100644 --- a/src/libsystemd/sd-device/device-private.c +++ b/src/libsystemd/sd-device/device-private.c @@ -24,6 +24,7 @@ #include "sd-device.h" +#include "alloc-util.h" #include "device-internal.h" #include "device-private.h" #include "device-util.h" diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index 3b964de56bc..0d40bc5c006 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -24,6 +24,7 @@ #include "sd-device.h" +#include "alloc-util.h" #include "device-internal.h" #include "device-private.h" #include "device-util.h" diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index b3f88817149..ee4886700e3 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -27,6 +27,7 @@ #include "sd-event.h" #include "sd-id128.h" +#include "alloc-util.h" #include "fd-util.h" #include "hashmap.h" #include "list.h" diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c index 9304fd376ef..0e034863d6c 100644 --- a/src/libsystemd/sd-hwdb/sd-hwdb.c +++ b/src/libsystemd/sd-hwdb/sd-hwdb.c @@ -29,6 +29,7 @@ #include "sd-hwdb.h" +#include "alloc-util.h" #include "fd-util.h" #include "hashmap.h" #include "hwdb-internal.h" diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libsystemd/sd-login/sd-login.c index 6b98a7c1785..cd766c3f91e 100644 --- a/src/libsystemd/sd-login/sd-login.c +++ b/src/libsystemd/sd-login/sd-login.c @@ -27,6 +27,7 @@ #include "sd-login.h" +#include "alloc-util.h" #include "cgroup-util.h" #include "dirent-util.h" #include "escape.h" diff --git a/src/libsystemd/sd-login/test-login.c b/src/libsystemd/sd-login/test-login.c index 46aa73b38ab..b0f94c9522e 100644 --- a/src/libsystemd/sd-login/test-login.c +++ b/src/libsystemd/sd-login/test-login.c @@ -24,6 +24,7 @@ #include "sd-login.h" +#include "alloc-util.h" #include "fd-util.h" #include "formats-util.h" #include "string-util.h" diff --git a/src/libsystemd/sd-netlink/local-addresses.c b/src/libsystemd/sd-netlink/local-addresses.c index e2f637f7f9c..a00865b56bd 100644 --- a/src/libsystemd/sd-netlink/local-addresses.c +++ b/src/libsystemd/sd-netlink/local-addresses.c @@ -21,6 +21,8 @@ ***/ #include "sd-netlink.h" + +#include "alloc-util.h" #include "netlink-util.h" #include "macro.h" #include "local-addresses.h" diff --git a/src/libsystemd/sd-netlink/netlink-message.c b/src/libsystemd/sd-netlink/netlink-message.c index 80ad70cfeee..03971b35963 100644 --- a/src/libsystemd/sd-netlink/netlink-message.c +++ b/src/libsystemd/sd-netlink/netlink-message.c @@ -25,6 +25,7 @@ #include "sd-netlink.h" +#include "alloc-util.h" #include "formats-util.h" #include "missing.h" #include "netlink-internal.h" diff --git a/src/libsystemd/sd-netlink/netlink-socket.c b/src/libsystemd/sd-netlink/netlink-socket.c index 68a4d3c0d1c..13945202e40 100644 --- a/src/libsystemd/sd-netlink/netlink-socket.c +++ b/src/libsystemd/sd-netlink/netlink-socket.c @@ -25,6 +25,7 @@ #include "sd-netlink.h" +#include "alloc-util.h" #include "formats-util.h" #include "missing.h" #include "netlink-internal.h" diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c index ba1f2a5a425..7c24e053cfb 100644 --- a/src/libsystemd/sd-netlink/sd-netlink.c +++ b/src/libsystemd/sd-netlink/sd-netlink.c @@ -24,6 +24,7 @@ #include "sd-netlink.h" +#include "alloc-util.h" #include "fd-util.h" #include "hashmap.h" #include "macro.h" diff --git a/src/libsystemd/sd-netlink/test-local-addresses.c b/src/libsystemd/sd-netlink/test-local-addresses.c index 9867eec0653..71801759700 100644 --- a/src/libsystemd/sd-netlink/test-local-addresses.c +++ b/src/libsystemd/sd-netlink/test-local-addresses.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "in-addr-util.h" #include "local-addresses.h" #include "af-list.h" diff --git a/src/libsystemd/sd-network/network-util.c b/src/libsystemd/sd-network/network-util.c index 8070ff07c41..a2d6c593147 100644 --- a/src/libsystemd/sd-network/network-util.c +++ b/src/libsystemd/sd-network/network-util.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "fd-util.h" #include "network-util.h" #include "strv.h" diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c index 6cc3321f429..2eaa2626f77 100644 --- a/src/libsystemd/sd-network/sd-network.c +++ b/src/libsystemd/sd-network/sd-network.c @@ -27,6 +27,7 @@ #include "sd-network.h" +#include "alloc-util.h" #include "fileio.h" #include "macro.h" #include "string-util.h" diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c index c1d42e96e57..480f1ad065e 100644 --- a/src/libsystemd/sd-path/sd-path.c +++ b/src/libsystemd/sd-path/sd-path.c @@ -19,6 +19,7 @@ #include "sd-path.h" +#include "alloc-util.h" #include "architecture.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c index 724405d534f..48767600c90 100644 --- a/src/libsystemd/sd-resolve/sd-resolve.c +++ b/src/libsystemd/sd-resolve/sd-resolve.c @@ -33,6 +33,7 @@ #include "sd-resolve.h" +#include "alloc-util.h" #include "fd-util.h" #include "io-util.h" #include "list.h" diff --git a/src/libsystemd/sd-resolve/test-resolve.c b/src/libsystemd/sd-resolve/test-resolve.c index 87e6e470418..05544a584c7 100644 --- a/src/libsystemd/sd-resolve/test-resolve.c +++ b/src/libsystemd/sd-resolve/test-resolve.c @@ -30,6 +30,7 @@ #include "sd-resolve.h" +#include "alloc-util.h" #include "macro.h" #include "resolve-util.h" #include "socket-util.h" diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c index bd349e3f640..814e016800c 100644 --- a/src/libudev/libudev-device.c +++ b/src/libudev/libudev-device.c @@ -37,6 +37,7 @@ #include "libudev.h" #include "sd-device.h" +#include "alloc-util.h" #include "device-private.h" #include "device-util.h" #include "libudev-device-internal.h" diff --git a/src/libudev/libudev-enumerate.c b/src/libudev/libudev-enumerate.c index 56436772b07..442f9615f2d 100644 --- a/src/libudev/libudev-enumerate.c +++ b/src/libudev/libudev-enumerate.c @@ -31,6 +31,7 @@ #include "libudev.h" #include "sd-device.h" +#include "alloc-util.h" #include "device-enumerator-private.h" #include "device-util.h" #include "libudev-device-internal.h" diff --git a/src/libudev/libudev-hwdb.c b/src/libudev/libudev-hwdb.c index 6dc2b0533ee..eba698d163e 100644 --- a/src/libudev/libudev-hwdb.c +++ b/src/libudev/libudev-hwdb.c @@ -19,6 +19,7 @@ #include "sd-hwdb.h" +#include "alloc-util.h" #include "hwdb-util.h" #include "libudev-private.h" diff --git a/src/libudev/libudev-list.c b/src/libudev/libudev-list.c index 19e9130be0b..da496ed4563 100644 --- a/src/libudev/libudev-list.c +++ b/src/libudev/libudev-list.c @@ -17,11 +17,12 @@ along with systemd; If not, see . ***/ -#include -#include #include +#include +#include #include +#include "alloc-util.h" #include "libudev-private.h" /** diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c index 0059c09e77b..fedaea6118c 100644 --- a/src/libudev/libudev-monitor.c +++ b/src/libudev/libudev-monitor.c @@ -30,6 +30,7 @@ #include "libudev.h" +#include "alloc-util.h" #include "fd-util.h" #include "fileio.h" #include "formats-util.h" diff --git a/src/libudev/libudev-queue.c b/src/libudev/libudev-queue.c index a22994c8a24..58410b1b8fe 100644 --- a/src/libudev/libudev-queue.c +++ b/src/libudev/libudev-queue.c @@ -24,6 +24,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "io-util.h" #include "libudev-private.h" diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c index afadfe69938..63fb05547de 100644 --- a/src/libudev/libudev.c +++ b/src/libudev/libudev.c @@ -26,6 +26,7 @@ #include "libudev.h" +#include "alloc-util.h" #include "fd-util.h" #include "libudev-private.h" #include "missing.h" diff --git a/src/locale/localed.c b/src/locale/localed.c index 1f25d232d20..720cbbaaba0 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c @@ -30,6 +30,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "bus-error.h" #include "bus-message.h" #include "bus-util.h" diff --git a/src/login/inhibit.c b/src/login/inhibit.c index f79f89af7ed..70fef332f7e 100644 --- a/src/login/inhibit.c +++ b/src/login/inhibit.c @@ -27,6 +27,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "bus-error.h" #include "bus-util.h" #include "fd-util.h" diff --git a/src/login/loginctl.c b/src/login/loginctl.c index 92443c81909..aff68a49fe9 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.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" diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c index acb2bd57653..d0dd569a03c 100644 --- a/src/login/logind-acl.c +++ b/src/login/logind-acl.c @@ -23,6 +23,7 @@ #include #include "acl-util.h" +#include "alloc-util.h" #include "dirent-util.h" #include "escape.h" #include "fd-util.h" diff --git a/src/login/logind-action.c b/src/login/logind-action.c index 8c452456a04..185108f8f1d 100644 --- a/src/login/logind-action.c +++ b/src/login/logind-action.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "bus-error.h" #include "bus-util.h" #include "conf-parser.h" diff --git a/src/login/logind-button.c b/src/login/logind-button.c index b98035be211..b08b69dbfc3 100644 --- a/src/login/logind-button.c +++ b/src/login/logind-button.c @@ -28,6 +28,7 @@ #include "sd-messages.h" +#include "alloc-util.h" #include "fd-util.h" #include "logind-button.h" #include "string-util.h" diff --git a/src/login/logind-core.c b/src/login/logind-core.c index c2541e490ba..b3f30c8dc93 100644 --- a/src/login/logind-core.c +++ b/src/login/logind-core.c @@ -25,6 +25,7 @@ #include #include +#include "alloc-util.h" #include "bus-error.h" #include "bus-util.h" #include "cgroup-util.h" diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 4204732e7d9..7890d68aa0f 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -26,6 +26,7 @@ #include "sd-messages.h" +#include "alloc-util.h" #include "audit-util.h" #include "bus-common-errors.h" #include "bus-error.h" diff --git a/src/login/logind-device.c b/src/login/logind-device.c index ee4c45fb8dd..ffb9162e56c 100644 --- a/src/login/logind-device.c +++ b/src/login/logind-device.c @@ -21,8 +21,9 @@ #include -#include "util.h" +#include "alloc-util.h" #include "logind-device.h" +#include "util.h" Device* device_new(Manager *m, const char *sysfs, bool master) { Device *d; diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c index 92b58070941..33fbdde557c 100644 --- a/src/login/logind-inhibit.c +++ b/src/login/logind-inhibit.c @@ -24,6 +24,7 @@ #include #include +#include "alloc-util.h" #include "escape.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c index 66626b5871d..43b578f364d 100644 --- a/src/login/logind-seat-dbus.c +++ b/src/login/logind-seat-dbus.c @@ -22,6 +22,7 @@ #include #include +#include "alloc-util.h" #include "bus-common-errors.h" #include "bus-label.h" #include "bus-util.h" diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c index 2dcf8ddc62b..1f4936cebe4 100644 --- a/src/login/logind-seat.c +++ b/src/login/logind-seat.c @@ -26,6 +26,7 @@ #include "sd-messages.h" +#include "alloc-util.h" #include "fd-util.h" #include "fileio.h" #include "formats-util.h" diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c index fe398a5eb68..7810199a542 100644 --- a/src/login/logind-session-dbus.c +++ b/src/login/logind-session-dbus.c @@ -22,6 +22,7 @@ #include #include +#include "alloc-util.h" #include "bus-common-errors.h" #include "bus-label.h" #include "bus-util.h" diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c index 3a0bb720f90..9bf3ca09955 100644 --- a/src/login/logind-session-device.c +++ b/src/login/logind-session-device.c @@ -27,6 +27,7 @@ #include "libudev.h" +#include "alloc-util.h" #include "bus-util.h" #include "fd-util.h" #include "logind-session-device.h" diff --git a/src/login/logind-session.c b/src/login/logind-session.c index 26c135b2ca6..a53dcb9960e 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -30,6 +30,7 @@ #include "sd-messages.h" +#include "alloc-util.h" #include "audit-util.h" #include "bus-error.h" #include "bus-util.h" diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c index 5975b579e96..df901f65581 100644 --- a/src/login/logind-user-dbus.c +++ b/src/login/logind-user-dbus.c @@ -22,6 +22,7 @@ #include #include +#include "alloc-util.h" #include "bus-util.h" #include "formats-util.h" #include "logind-user.h" diff --git a/src/login/logind-user.c b/src/login/logind-user.c index 1cf9be74419..56bc5a010c6 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -24,6 +24,7 @@ #include #include +#include "alloc-util.h" #include "bus-error.h" #include "bus-util.h" #include "clean-ipc.h" diff --git a/src/login/logind-utmp.c b/src/login/logind-utmp.c index 3f4a629be35..3e7a935a34a 100644 --- a/src/login/logind-utmp.c +++ b/src/login/logind-utmp.c @@ -26,6 +26,7 @@ #include "sd-messages.h" +#include "alloc-util.h" #include "audit-util.h" #include "bus-common-errors.h" #include "bus-error.h" diff --git a/src/login/logind.c b/src/login/logind.c index 957ea1fd7ed..4b8c834269a 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -27,6 +27,7 @@ #include "libudev.h" #include "sd-daemon.h" +#include "alloc-util.h" #include "bus-error.h" #include "bus-util.h" #include "conf-parser.h" diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c index c37cfdb68b0..0d61f528db3 100644 --- a/src/login/pam_systemd.c +++ b/src/login/pam_systemd.c @@ -30,6 +30,7 @@ #include #include +#include "alloc-util.h" #include "audit-util.h" #include "bus-common-errors.h" #include "bus-error.h" diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c index 0f671ac90eb..e9ca4bb03d0 100644 --- a/src/login/sysfs-show.c +++ b/src/login/sysfs-show.c @@ -24,6 +24,7 @@ #include "libudev.h" +#include "alloc-util.h" #include "locale-util.h" #include "path-util.h" #include "string-util.h" diff --git a/src/machine/image-dbus.c b/src/machine/image-dbus.c index a287b9697a7..4ec17660339 100644 --- a/src/machine/image-dbus.c +++ b/src/machine/image-dbus.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "bus-label.h" #include "bus-util.h" #include "image-dbus.h" diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index 1132d758237..452130a29cf 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -29,6 +29,7 @@ #include #undef basename +#include "alloc-util.h" #include "bus-common-errors.h" #include "bus-internal.h" #include "bus-label.h" diff --git a/src/machine/machine.c b/src/machine/machine.c index 2889cb32054..fa6b70f788c 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -25,6 +25,7 @@ #include "sd-messages.h" +#include "alloc-util.h" #include "bus-error.h" #include "bus-util.h" #include "escape.h" diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index b8b9e0f5191..7e17c7a41c1 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -33,6 +33,7 @@ #include "sd-bus.h" +#include "alloc-util.h" #include "bus-error.h" #include "bus-util.h" #include "cgroup-show.h" diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c index 182dedda897..7827f063c19 100644 --- a/src/machine/machined-dbus.c +++ b/src/machine/machined-dbus.c @@ -25,6 +25,7 @@ #include "sd-id128.h" +#include "alloc-util.h" #include "btrfs-util.h" #include "bus-common-errors.h" #include "bus-util.h" diff --git a/src/machine/machined.c b/src/machine/machined.c index 1a61da041d2..d6e7ce67fc8 100644 --- a/src/machine/machined.c +++ b/src/machine/machined.c @@ -25,6 +25,7 @@ #include "sd-daemon.h" +#include "alloc-util.h" #include "bus-error.h" #include "bus-util.h" #include "cgroup-util.h" diff --git a/src/network/networkctl.c b/src/network/networkctl.c index d0d7669c873..97c1fe65602 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -28,6 +28,7 @@ #include "sd-netlink.h" #include "sd-network.h" +#include "alloc-util.h" #include "arphrd-list.h" #include "device-util.h" #include "ether-addr-util.h" diff --git a/src/network/networkd-address-pool.c b/src/network/networkd-address-pool.c index 08e0b9a64b6..889fe1e30d3 100644 --- a/src/network/networkd-address-pool.c +++ b/src/network/networkd-address-pool.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "networkd-address-pool.h" #include "networkd.h" #include "set.h" diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index 1beb7ffae48..e550ee5701d 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "conf-parser.h" #include "firewall-util.h" #include "netlink-util.h" diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index 22594a94155..c412a2cc315 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -22,10 +22,11 @@ #include #include +#include "alloc-util.h" +#include "dhcp-lease-internal.h" #include "hostname-util.h" -#include "networkd-link.h" #include "network-internal.h" -#include "dhcp-lease-internal.h" +#include "networkd-link.h" static int dhcp4_route_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) { diff --git a/src/network/networkd-fdb.c b/src/network/networkd-fdb.c index 9cb63cb79f4..c9222b8cb8e 100644 --- a/src/network/networkd-fdb.c +++ b/src/network/networkd-fdb.c @@ -22,12 +22,12 @@ #include #include +#include "alloc-util.h" #include "conf-parser.h" -#include "util.h" #include "netlink-util.h" - -#include "networkd.h" #include "networkd-fdb.h" +#include "networkd.h" +#include "util.h" /* create a new FDB entry or get an existing one. */ int fdb_entry_new_static(Network *const network, diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c index f40a01fd78e..7fc4510ac90 100644 --- a/src/network/networkd-link-bus.c +++ b/src/network/networkd-link-bus.c @@ -22,6 +22,7 @@ #include "bus-util.h" #include "strv.h" +#include "alloc-util.h" #include "networkd-link.h" #include "networkd.h" #include "parse-util.h" diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index ab37c43dcb4..dcc2569660c 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -23,6 +23,7 @@ #include #include +#include "alloc-util.h" #include "bus-util.h" #include "dhcp-lease-internal.h" #include "fd-util.h" diff --git a/src/network/networkd-manager-bus.c b/src/network/networkd-manager-bus.c index b281f4fdb6c..dafaf2daea6 100644 --- a/src/network/networkd-manager-bus.c +++ b/src/network/networkd-manager-bus.c @@ -19,8 +19,8 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "bus-util.h" - #include "networkd.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_operational_state, link_operstate, LinkOperationalState); diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index af243c9a708..6b2a661ca7f 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -25,6 +25,7 @@ #include "sd-daemon.h" #include "sd-netlink.h" +#include "alloc-util.h" #include "bus-util.h" #include "conf-parser.h" #include "def.h" diff --git a/src/network/networkd-netdev-bond.c b/src/network/networkd-netdev-bond.c index ce9c18d6548..70105b8aa0c 100644 --- a/src/network/networkd-netdev-bond.c +++ b/src/network/networkd-netdev-bond.c @@ -25,6 +25,7 @@ #include "sd-netlink.h" +#include "alloc-util.h" #include "conf-parser.h" #include "missing.h" #include "networkd-netdev-bond.h" diff --git a/src/network/networkd-netdev-tuntap.c b/src/network/networkd-netdev-tuntap.c index d04bb9bd9f8..851e83537e7 100644 --- a/src/network/networkd-netdev-tuntap.c +++ b/src/network/networkd-netdev-tuntap.c @@ -23,6 +23,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "networkd-netdev-tuntap.h" #include "user-util.h" diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c index 5060888a2f7..dd0b400c6a0 100644 --- a/src/network/networkd-netdev.c +++ b/src/network/networkd-netdev.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "conf-files.h" #include "conf-parser.h" #include "fd-util.h" diff --git a/src/network/networkd-network-bus.c b/src/network/networkd-network-bus.c index 2199b93baae..120760a986d 100644 --- a/src/network/networkd-network-bus.c +++ b/src/network/networkd-network-bus.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "networkd.h" #include "string-util.h" #include "strv.h" diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index c8c6f5df117..cc8d019017c 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -22,6 +22,7 @@ #include #include +#include "alloc-util.h" #include "conf-files.h" #include "conf-parser.h" #include "dns-domain.h" diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c index 7ae6ca26005..4a74bc69f3a 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "conf-parser.h" #include "in-addr-util.h" #include "netlink-util.h" diff --git a/src/network/networkd-wait-online-link.c b/src/network/networkd-wait-online-link.c index cc4b46d5b07..c2779ff773e 100644 --- a/src/network/networkd-wait-online-link.c +++ b/src/network/networkd-wait-online-link.c @@ -22,6 +22,7 @@ #include "sd-network.h" +#include "alloc-util.h" #include "networkd-wait-online-link.h" #include "string-util.h" diff --git a/src/network/networkd-wait-online-manager.c b/src/network/networkd-wait-online-manager.c index 112d92a568a..0c40ab2bb8a 100644 --- a/src/network/networkd-wait-online-manager.c +++ b/src/network/networkd-wait-online-manager.c @@ -23,14 +23,13 @@ #include #include +#include "alloc-util.h" #include "netlink-util.h" - #include "network-internal.h" #include "networkd-wait-online-link.h" #include "networkd-wait-online.h" - -#include "util.h" #include "time-util.h" +#include "util.h" bool manager_ignore_link(Manager *m, Link *link) { char **ignore; diff --git a/src/network/test-network.c b/src/network/test-network.c index bac1d6781dd..dbed3795e3f 100644 --- a/src/network/test-network.c +++ b/src/network/test-network.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "networkd.h" #include "network-internal.h" #include "dhcp-lease-internal.h" diff --git a/src/notify/notify.c b/src/notify/notify.c index 77f017dbac6..b1445547023 100644 --- a/src/notify/notify.c +++ b/src/notify/notify.c @@ -27,6 +27,7 @@ #include "sd-daemon.h" +#include "alloc-util.h" #include "env-util.h" #include "formats-util.h" #include "log.h" diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c index 4e86ed13cba..270bcf010fc 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "cgroup-util.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/nspawn/nspawn-expose-ports.c b/src/nspawn/nspawn-expose-ports.c index 89c82403992..38245434da8 100644 --- a/src/nspawn/nspawn-expose-ports.c +++ b/src/nspawn/nspawn-expose-ports.c @@ -21,6 +21,7 @@ #include "sd-netlink.h" +#include "alloc-util.h" #include "fd-util.h" #include "firewall-util.h" #include "in-addr-util.h" diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c index 81003dff89a..ee61306aa55 100644 --- a/src/nspawn/nspawn-mount.c +++ b/src/nspawn/nspawn-mount.c @@ -22,6 +22,7 @@ #include #include +#include "alloc-util.h" #include "cgroup-util.h" #include "escape.h" #include "fs-util.h" diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c index 4af18a4e94e..29384b60b22 100644 --- a/src/nspawn/nspawn-network.c +++ b/src/nspawn/nspawn-network.c @@ -26,6 +26,7 @@ #include "sd-id128.h" #include "sd-netlink.h" +#include "alloc-util.h" #include "ether-addr-util.h" #include "netlink-util.h" #include "siphash24.h" diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c index f0888847761..ee9e70acec8 100644 --- a/src/nspawn/nspawn-settings.c +++ b/src/nspawn/nspawn-settings.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "util.h" #include "conf-parser.h" #include "strv.h" diff --git a/src/nspawn/nspawn-setuid.c b/src/nspawn/nspawn-setuid.c index 6b4ca5a3f30..aa6a16309c9 100644 --- a/src/nspawn/nspawn-setuid.c +++ b/src/nspawn/nspawn-setuid.c @@ -23,6 +23,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "mkdir.h" #include "nspawn-setuid.h" diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 1ce219b8446..8140cda1414 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -46,6 +46,7 @@ #include "sd-daemon.h" #include "sd-id128.h" +#include "alloc-util.h" #include "barrier.h" #include "base-filesystem.h" #include "blkid-util.h" diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c index 009a9ad886e..ee10b105eab 100644 --- a/src/nss-myhostname/nss-myhostname.c +++ b/src/nss-myhostname/nss-myhostname.c @@ -26,6 +26,7 @@ #include #include +#include "alloc-util.h" #include "hostname-util.h" #include "local-addresses.h" #include "macro.h" diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c index b98bde676b9..969fa9619e1 100644 --- a/src/nss-mymachines/nss-mymachines.c +++ b/src/nss-mymachines/nss-mymachines.c @@ -25,6 +25,7 @@ #include "sd-bus.h" #include "sd-login.h" +#include "alloc-util.h" #include "bus-common-errors.h" #include "bus-util.h" #include "hostname-util.h" diff --git a/src/path/path.c b/src/path/path.c index 97e8323de13..0ece72f6fe2 100644 --- a/src/path/path.c +++ b/src/path/path.c @@ -26,6 +26,7 @@ #include "sd-path.h" +#include "alloc-util.h" #include "log.h" #include "macro.h" #include "string-util.h" diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c index fbfd3a3eba7..d857ade36a0 100644 --- a/src/random-seed/random-seed.c +++ b/src/random-seed/random-seed.c @@ -25,6 +25,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "io-util.h" #include "log.h" diff --git a/src/rc-local-generator/rc-local-generator.c b/src/rc-local-generator/rc-local-generator.c index 1007de39594..8e5cf0908c1 100644 --- a/src/rc-local-generator/rc-local-generator.c +++ b/src/rc-local-generator/rc-local-generator.c @@ -24,6 +24,7 @@ #include #include +#include "alloc-util.h" #include "log.h" #include "mkdir.h" #include "string-util.h" diff --git a/src/resolve-host/resolve-host.c b/src/resolve-host/resolve-host.c index 9b808ff110f..57739d1f3e7 100644 --- a/src/resolve-host/resolve-host.c +++ b/src/resolve-host/resolve-host.c @@ -25,6 +25,7 @@ #include "sd-bus.h" #include "af-list.h" +#include "alloc-util.h" #include "bus-error.h" #include "bus-util.h" #include "in-addr-util.h" diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c index bf1b7c8ab44..f0a3b607d4a 100644 --- a/src/resolve/resolved-bus.c +++ b/src/resolve/resolved-bus.c @@ -19,9 +19,9 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "bus-common-errors.h" #include "bus-util.h" - #include "dns-domain.h" #include "resolved-bus.h" #include "resolved-def.h" diff --git a/src/resolve/resolved-conf.c b/src/resolve/resolved-conf.c index 17eafec2fa6..c9919ced670 100644 --- a/src/resolve/resolved-conf.c +++ b/src/resolve/resolved-conf.c @@ -19,10 +19,11 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "conf-parser.h" +#include "extract-word.h" #include "parse-util.h" #include "resolved-conf.h" -#include "extract-word.h" #include "string-util.h" int manager_parse_dns_server(Manager *m, DnsServerType type, const char *string) { @@ -35,7 +36,7 @@ int manager_parse_dns_server(Manager *m, DnsServerType type, const char *string) first = type == DNS_SERVER_FALLBACK ? m->fallback_dns_servers : m->dns_servers; for(;;) { - _cleanup_free_ char *word; + _cleanup_free_ char *word = NULL; union in_addr_union addr; bool found = false; DnsServer *s; @@ -44,7 +45,6 @@ int manager_parse_dns_server(Manager *m, DnsServerType type, const char *string) r = extract_first_word(&string, &word, NULL, 0); if (r < 0) return log_error_errno(r, "Failed to parse resolved dns server syntax \"%s\": %m", string); - if (r == 0) break; diff --git a/src/resolve/resolved-dns-answer.c b/src/resolve/resolved-dns-answer.c index e1a2865007a..3cf9c680747 100644 --- a/src/resolve/resolved-dns-answer.c +++ b/src/resolve/resolved-dns-answer.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "dns-domain.h" #include "resolved-dns-answer.h" #include "string-util.h" diff --git a/src/resolve/resolved-dns-cache.c b/src/resolve/resolved-dns-cache.c index ab13636bc18..04f64022e01 100644 --- a/src/resolve/resolved-dns-cache.c +++ b/src/resolve/resolved-dns-cache.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "resolved-dns-cache.h" #include "resolved-dns-packet.h" diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c index f7f936d3435..f23b3cf8934 100644 --- a/src/resolve/resolved-dns-packet.c +++ b/src/resolve/resolved-dns-packet.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "dns-domain.h" #include "resolved-dns-packet.h" #include "string-table.h" diff --git a/src/resolve/resolved-dns-query.c b/src/resolve/resolved-dns-query.c index 4b1d18b2ef1..f7cb84e2a62 100644 --- a/src/resolve/resolved-dns-query.c +++ b/src/resolve/resolved-dns-query.c @@ -19,10 +19,10 @@ along with systemd; If not, see . ***/ -#include "hostname-util.h" +#include "alloc-util.h" #include "dns-domain.h" +#include "hostname-util.h" #include "local-addresses.h" - #include "resolved-dns-query.h" /* How long to wait for the query in total */ diff --git a/src/resolve/resolved-dns-question.c b/src/resolve/resolved-dns-question.c index 1507f22da09..48951221dc9 100644 --- a/src/resolve/resolved-dns-question.c +++ b/src/resolve/resolved-dns-question.c @@ -19,8 +19,9 @@ along with systemd; If not, see . ***/ -#include "resolved-dns-question.h" +#include "alloc-util.h" #include "dns-domain.h" +#include "resolved-dns-question.h" DnsQuestion *dns_question_new(unsigned n) { DnsQuestion *q; diff --git a/src/resolve/resolved-dns-rr.c b/src/resolve/resolved-dns-rr.c index 63edee1fd17..ba2ea686f33 100644 --- a/src/resolve/resolved-dns-rr.c +++ b/src/resolve/resolved-dns-rr.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "dns-domain.h" #include "dns-type.h" #include "hexdecoct.h" diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c index 7c63c63b63c..b15370b017b 100644 --- a/src/resolve/resolved-dns-scope.c +++ b/src/resolve/resolved-dns-scope.c @@ -22,6 +22,7 @@ #include #include "af-list.h" +#include "alloc-util.h" #include "dns-domain.h" #include "fd-util.h" #include "hostname-util.h" diff --git a/src/resolve/resolved-dns-server.c b/src/resolve/resolved-dns-server.c index 8693911e654..e803f635abd 100644 --- a/src/resolve/resolved-dns-server.c +++ b/src/resolve/resolved-dns-server.c @@ -19,9 +19,9 @@ along with systemd; If not, see . ***/ -#include "siphash24.h" - +#include "alloc-util.h" #include "resolved-dns-server.h" +#include "siphash24.h" /* After how much time to repeat classic DNS requests */ #define DNS_TIMEOUT_MIN_USEC (500 * USEC_PER_MSEC) diff --git a/src/resolve/resolved-dns-stream.c b/src/resolve/resolved-dns-stream.c index 1150c306778..1c501182fb7 100644 --- a/src/resolve/resolved-dns-stream.c +++ b/src/resolve/resolved-dns-stream.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "fd-util.h" #include "io-util.h" #include "missing.h" diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c index c60197cf8db..6545f6cd8a7 100644 --- a/src/resolve/resolved-dns-transaction.c +++ b/src/resolve/resolved-dns-transaction.c @@ -20,6 +20,7 @@ ***/ #include "af-list.h" +#include "alloc-util.h" #include "dns-domain.h" #include "fd-util.h" #include "random-util.h" diff --git a/src/resolve/resolved-dns-zone.c b/src/resolve/resolved-dns-zone.c index 8a6086a4de8..48dcf76daac 100644 --- a/src/resolve/resolved-dns-zone.c +++ b/src/resolve/resolved-dns-zone.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "dns-domain.h" #include "list.h" #include "resolved-dns-packet.h" diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c index 8c88e2dbf11..28926410753 100644 --- a/src/resolve/resolved-link.c +++ b/src/resolve/resolved-link.c @@ -23,6 +23,7 @@ #include "sd-network.h" +#include "alloc-util.h" #include "missing.h" #include "parse-util.h" #include "resolved-link.h" diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index b9c625b9cf2..a588538b52a 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -25,6 +25,7 @@ #include #include "af-list.h" +#include "alloc-util.h" #include "dns-domain.h" #include "fd-util.h" #include "fileio-label.h" diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c index 5ba1e3d4a8c..bb00f99ecf7 100644 --- a/src/rfkill/rfkill.c +++ b/src/rfkill/rfkill.c @@ -25,6 +25,7 @@ #include "libudev.h" #include "sd-daemon.h" +#include "alloc-util.h" #include "escape.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/run/run.c b/src/run/run.c index dbcb29546f5..38a482bb117 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -25,6 +25,7 @@ #include "sd-bus.h" #include "sd-event.h" +#include "alloc-util.h" #include "bus-error.h" #include "bus-util.h" #include "calendarspec.h" diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c index e8931daee29..79f5a605796 100644 --- a/src/shared/acl-util.c +++ b/src/shared/acl-util.c @@ -22,6 +22,7 @@ #include #include +#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 b3d2f968855..8e36067f745 100644 --- a/src/shared/acpi-fpdt.c +++ b/src/shared/acpi-fpdt.c @@ -25,6 +25,7 @@ #include #include +#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 48d0f84995f..f6ac43adfe7 100644 --- a/src/shared/apparmor-util.c +++ b/src/shared/apparmor-util.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#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 b2dbf98b8e6..c96dbf877a6 100644 --- a/src/shared/ask-password-api.c +++ b/src/shared/ask-password-api.c @@ -32,6 +32,7 @@ #include #include +#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 ff91c6bdc50..e605490c321 100644 --- a/src/shared/base-filesystem.c +++ b/src/shared/base-filesystem.c @@ -24,6 +24,7 @@ #include #include +#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 8f6278191ab..f4a918063d2 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 9e70713ce8d..129ffc7056b 100644 --- a/src/shared/cgroup-show.c +++ b/src/shared/cgroup-show.c @@ -24,6 +24,7 @@ #include #include +#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 2929e3e8210..a69719116c9 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 fa13eb80758..163a83518ba 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 0d321af9671..ad3c17d5bd1 100644 --- a/src/shared/dev-setup.c +++ b/src/shared/dev-setup.c @@ -23,6 +23,7 @@ #include #include +#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 b6587306a58..7af15e00984 100644 --- a/src/shared/dns-domain.c +++ b/src/shared/dns-domain.c @@ -24,6 +24,7 @@ #include #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 25400277ff9..0d44401cc2e 100644 --- a/src/shared/dropin.c +++ b/src/shared/dropin.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#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 e7972d1574c..86bb0b57c3d 100644 --- a/src/shared/efivars.c +++ b/src/shared/efivars.c @@ -23,6 +23,7 @@ #include #include +#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 effc6e8e703..e1782878726 100644 --- a/src/shared/firewall-util.c +++ b/src/shared/firewall-util.c @@ -27,8 +27,9 @@ #include #include -#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 1ea11ea5a45..eb2845cddf4 100644 --- a/src/shared/fstab-util.c +++ b/src/shared/fstab-util.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#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 203e01318bd..cb4ebc606e6 100644 --- a/src/shared/generator.c +++ b/src/shared/generator.c @@ -21,6 +21,7 @@ #include +#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 bf5395dee88..ddc8c00a2d5 100644 --- a/src/shared/import-util.c +++ b/src/shared/import-util.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#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 224874f65cc..e1cb5d27ffa 100644 --- a/src/shared/install-printf.c +++ b/src/shared/install-printf.c @@ -21,6 +21,7 @@ #include +#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 1f63ae9ce0e..c74efede76e 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -25,6 +25,7 @@ #include #include +#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 5b4a220e5fb..0313b0946f3 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -25,6 +25,7 @@ #include #include +#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 a4e77fb8d89..2c1da0a40d5 100644 --- a/src/shared/machine-image.c +++ b/src/shared/machine-image.c @@ -23,6 +23,7 @@ #include #include +#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 1c7e0ef2c10..60b1b3092d7 100644 --- a/src/shared/machine-pool.c +++ b/src/shared/machine-pool.c @@ -24,6 +24,7 @@ #include #include +#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 1e63c720474..d71f379e767 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c @@ -24,6 +24,7 @@ #include #include +#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 e5e0f37adf1..786752ea941 100644 --- a/src/shared/ptyfwd.c +++ b/src/shared/ptyfwd.c @@ -24,6 +24,7 @@ #include #include +#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 0e232e6aa6f..bbbb3460d4a 100644 --- a/src/shared/sleep-config.c +++ b/src/shared/sleep-config.c @@ -21,6 +21,7 @@ #include +#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 610aec0df5b..c5c4a4d7d7f 100644 --- a/src/shared/specifier.c +++ b/src/shared/specifier.c @@ -22,11 +22,12 @@ #include #include +#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 1e6ac2f27dd..13b32a0509b 100644 --- a/src/shared/utmp-wtmp.c +++ b/src/shared/utmp-wtmp.c @@ -27,6 +27,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "hostname-util.h" #include "macro.h" diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c index e82fb064171..ba82adadb42 100644 --- a/src/socket-proxy/socket-proxyd.c +++ b/src/socket-proxy/socket-proxyd.c @@ -34,6 +34,7 @@ #include "sd-event.h" #include "sd-resolve.h" +#include "alloc-util.h" #include "fd-util.h" #include "log.h" #include "path-util.h" diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 2faa93ef881..f5efa1a064f 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -37,6 +37,7 @@ #include "sd-daemon.h" #include "sd-login.h" +#include "alloc-util.h" #include "bus-common-errors.h" #include "bus-error.h" #include "bus-message.h" diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c index 5d2cbe12256..36d310b4c4a 100644 --- a/src/sysusers/sysusers.c +++ b/src/sysusers/sysusers.c @@ -26,6 +26,7 @@ #include #include +#include "alloc-util.h" #include "conf-files.h" #include "copy.h" #include "fileio-label.h" diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index e4b02ca990c..0a0b9269b3f 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -25,6 +25,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "hashmap.h" #include "hexdecoct.h" diff --git a/src/test/test-calendarspec.c b/src/test/test-calendarspec.c index 12f366a34c8..70819b0371c 100644 --- a/src/test/test-calendarspec.c +++ b/src/test/test-calendarspec.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "calendarspec.h" #include "string-util.h" #include "util.h" diff --git a/src/test/test-cap-list.c b/src/test/test-cap-list.c index f43f7379517..4418bafda6e 100644 --- a/src/test/test-cap-list.c +++ b/src/test/test-cap-list.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "cap-list.h" #include "capability-util.h" #include "fileio.h" diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c index e4f6d5168d8..a48b324e260 100644 --- a/src/test/test-cgroup-util.c +++ b/src/test/test-cgroup-util.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "cgroup-util.h" #include "dirent-util.h" #include "fd-util.h" diff --git a/src/test/test-condition.c b/src/test/test-condition.c index 365f5794d43..f224c6cdd8c 100644 --- a/src/test/test-condition.c +++ b/src/test/test-condition.c @@ -19,6 +19,7 @@ #include "sd-id128.h" +#include "alloc-util.h" #include "apparmor-util.h" #include "architecture.h" #include "audit-util.h" diff --git a/src/test/test-conf-files.c b/src/test/test-conf-files.c index f4b23355fc9..a69698d4ead 100644 --- a/src/test/test-conf-files.c +++ b/src/test/test-conf-files.c @@ -22,6 +22,7 @@ #include #include +#include "alloc-util.h" #include "conf-files.h" #include "fs-util.h" #include "macro.h" diff --git a/src/test/test-copy.c b/src/test/test-copy.c index 4ccf729e80b..ad57cb0202f 100644 --- a/src/test/test-copy.c +++ b/src/test/test-copy.c @@ -19,6 +19,7 @@ #include +#include "alloc-util.h" #include "copy.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/test/test-date.c b/src/test/test-date.c index e1c6ecb2ef9..c6d8bf82eaa 100644 --- a/src/test/test-date.c +++ b/src/test/test-date.c @@ -21,8 +21,9 @@ #include -#include "util.h" +#include "alloc-util.h" #include "string-util.h" +#include "util.h" static void test_should_pass(const char *p) { usec_t t, q; diff --git a/src/test/test-device-nodes.c b/src/test/test-device-nodes.c index 1c745d6e5b4..646b168cc0e 100644 --- a/src/test/test-device-nodes.c +++ b/src/test/test-device-nodes.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "device-nodes.h" #include "string-util.h" #include "util.h" diff --git a/src/test/test-dns-domain.c b/src/test/test-dns-domain.c index 1a8541e1cc1..d5778748a05 100644 --- a/src/test/test-dns-domain.c +++ b/src/test/test-dns-domain.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "dns-domain.h" #include "macro.h" #include "string-util.h" diff --git a/src/test/test-ellipsize.c b/src/test/test-ellipsize.c index 033d5af7191..c597d5aecd2 100644 --- a/src/test/test-ellipsize.c +++ b/src/test/test-ellipsize.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "def.h" #include "string-util.h" #include "terminal-util.h" diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c index 1c1fed4660b..e588681b86f 100644 --- a/src/test/test-fileio.c +++ b/src/test/test-fileio.c @@ -23,6 +23,7 @@ #include #include +#include "alloc-util.h" #include "ctype.h" #include "def.h" #include "env-util.h" diff --git a/src/test/test-fstab-util.c b/src/test/test-fstab-util.c index b02f3a6e7c9..27816ac7796 100644 --- a/src/test/test-fstab-util.c +++ b/src/test/test-fstab-util.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "fstab-util.h" #include "log.h" #include "string-util.h" diff --git a/src/test/test-hashmap-plain.c b/src/test/test-hashmap-plain.c index 2da64469617..6bf33306a94 100644 --- a/src/test/test-hashmap-plain.c +++ b/src/test/test-hashmap-plain.c @@ -17,6 +17,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "hashmap.h" #include "string-util.h" #include "strv.h" diff --git a/src/test/test-hostname-util.c b/src/test/test-hostname-util.c index ac8f4ecc686..590175433c3 100644 --- a/src/test/test-hostname-util.c +++ b/src/test/test-hostname-util.c @@ -21,10 +21,11 @@ along with systemd; If not, see . ***/ -#include "util.h" +#include "alloc-util.h" #include "fileio.h" #include "hostname-util.h" #include "string-util.h" +#include "util.h" static void test_hostname_is_valid(void) { assert_se(hostname_is_valid("foobar", false)); diff --git a/src/test/test-id128.c b/src/test/test-id128.c index 2c8ba70ffb8..32cf3f80ca6 100644 --- a/src/test/test-id128.c +++ b/src/test/test-id128.c @@ -24,6 +24,7 @@ #include "sd-daemon.h" #include "sd-id128.h" +#include "alloc-util.h" #include "macro.h" #include "string-util.h" #include "util.h" diff --git a/src/test/test-json.c b/src/test/test-json.c index ba4d75c0c8c..3995224eea8 100644 --- a/src/test/test-json.c +++ b/src/test/test-json.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "json.h" #include "string-util.h" #include "util.h" diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c index a060a7ba6f1..5a12e959d43 100644 --- a/src/test/test-namespace.c +++ b/src/test/test-namespace.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "fd-util.h" #include "namespace.h" #include "process-util.h" diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c index e2979a8710b..3f0f0264abf 100644 --- a/src/test/test-path-util.c +++ b/src/test/test-path-util.c @@ -23,6 +23,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "macro.h" #include "mount-util.h" diff --git a/src/test/test-path.c b/src/test/test-path.c index 405434c1ffd..ff0f044958b 100644 --- a/src/test/test-path.c +++ b/src/test/test-path.c @@ -20,6 +20,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "fs-util.h" #include "macro.h" diff --git a/src/test/test-prioq.c b/src/test/test-prioq.c index 1e2e42cbca1..07273ffe792 100644 --- a/src/test/test-prioq.c +++ b/src/test/test-prioq.c @@ -21,10 +21,11 @@ #include -#include "util.h" -#include "set.h" +#include "alloc-util.h" #include "prioq.h" +#include "set.h" #include "siphash24.h" +#include "util.h" #define SET_SIZE 1024*4 diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c index 16a7148b19f..fa448348da7 100644 --- a/src/test/test-process-util.c +++ b/src/test/test-process-util.c @@ -23,6 +23,7 @@ #include #include +#include "alloc-util.h" #include "log.h" #include "macro.h" #include "process-util.h" diff --git a/src/test/test-socket-util.c b/src/test/test-socket-util.c index 4a2d952c868..b9699b20283 100644 --- a/src/test/test-socket-util.c +++ b/src/test/test-socket-util.c @@ -17,6 +17,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "async.h" #include "fd-util.h" #include "in-addr-util.h" diff --git a/src/test/test-strv.c b/src/test/test-strv.c index c676893719a..c27f15283ec 100644 --- a/src/test/test-strv.c +++ b/src/test/test-strv.c @@ -22,6 +22,7 @@ #include +#include "alloc-util.h" #include "specifier.h" #include "string-util.h" #include "strv.h" diff --git a/src/test/test-tmpfiles.c b/src/test/test-tmpfiles.c index 683fbe217ce..a8bd722e443 100644 --- a/src/test/test-tmpfiles.c +++ b/src/test/test-tmpfiles.c @@ -24,6 +24,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "fileio.h" #include "formats-util.h" diff --git a/src/test/test-uid-range.c b/src/test/test-uid-range.c index 9f69d71203d..4dcf10e26db 100644 --- a/src/test/test-uid-range.c +++ b/src/test/test-uid-range.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "uid-range.h" #include "user-util.h" #include "util.h" diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c index 226453d06e5..c58c48af3cb 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -26,6 +26,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "fileio.h" #include "hashmap.h" diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c index 5aff771af58..9db7853dd4f 100644 --- a/src/test/test-unit-name.c +++ b/src/test/test-unit-name.c @@ -26,6 +26,7 @@ #include #include +#include "alloc-util.h" #include "hostname-util.h" #include "macro.h" #include "manager.h" diff --git a/src/test/test-user-util.c b/src/test/test-user-util.c index dfd20319985..09d37087e5c 100644 --- a/src/test/test-user-util.c +++ b/src/test/test-user-util.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "macro.h" #include "string-util.h" #include "user-util.h" diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c index a8e15b7cf12..0af8349732e 100644 --- a/src/test/test-utf8.c +++ b/src/test/test-utf8.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "utf8.h" #include "util.h" #include "string-util.h" diff --git a/src/test/test-util.c b/src/test/test-util.c index 647eff0496e..ffde10c7e1d 100644 --- a/src/test/test-util.c +++ b/src/test/test-util.c @@ -31,6 +31,7 @@ #include #include +#include "alloc-util.h" #include "conf-parser.h" #include "cpu-set-util.h" #include "def.h" diff --git a/src/test/test-xml.c b/src/test/test-xml.c index 93b0e7c3fbb..548d75a3c30 100644 --- a/src/test/test-xml.c +++ b/src/test/test-xml.c @@ -21,6 +21,7 @@ #include +#include "alloc-util.h" #include "string-util.h" #include "util.h" #include "xml.h" diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c index 507a83b2a1c..968ef8a7880 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -27,6 +27,7 @@ #include "sd-event.h" #include "sd-messages.h" +#include "alloc-util.h" #include "bus-common-errors.h" #include "bus-error.h" #include "bus-util.h" diff --git a/src/timesync/timesyncd-conf.c b/src/timesync/timesyncd-conf.c index ad6fd180e49..be651fc636f 100644 --- a/src/timesync/timesyncd-conf.c +++ b/src/timesync/timesyncd-conf.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "string-util.h" #include "timesyncd-manager.h" #include "timesyncd-server.h" @@ -35,16 +36,16 @@ int manager_parse_server_string(Manager *m, ServerType type, const char *string) first = type == SERVER_FALLBACK ? m->fallback_servers : m->system_servers; for (;;) { - _cleanup_free_ char *word; + _cleanup_free_ char *word = NULL; bool found = false; ServerName *n; r = extract_first_word(&string, &word, NULL, 0); if (r < 0) return log_error_errno(r, "Failed to parse timesyncd server syntax \"%s\": %m", string); - if (r == 0) break; + /* Filter out duplicates */ LIST_FOREACH(names, n, first) if (streq_ptr(n->string, word)) { diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index 15ca006debb..b4995c30647 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -33,6 +33,7 @@ #include "sd-daemon.h" +#include "alloc-util.h" #include "fd-util.h" #include "fs-util.h" #include "list.h" diff --git a/src/timesync/timesyncd-server.c b/src/timesync/timesyncd-server.c index ec3fe1fc4e8..f98e6b4cf00 100644 --- a/src/timesync/timesyncd-server.c +++ b/src/timesync/timesyncd-server.c @@ -19,6 +19,7 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "timesyncd-server.h" int server_address_new( diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 5196447963a..3c0b9993e35 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -39,6 +39,7 @@ #include #include "acl-util.h" +#include "alloc-util.h" #include "btrfs-util.h" #include "capability-util.h" #include "chattr-util.h" diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c index a6240ae89a5..d2938f08725 100644 --- a/src/tty-ask-password-agent/tty-ask-password-agent.c +++ b/src/tty-ask-password-agent/tty-ask-password-agent.c @@ -32,6 +32,7 @@ #include #include +#include "alloc-util.h" #include "ask-password-api.h" #include "conf-parser.h" #include "def.h" diff --git a/src/udev/collect/collect.c b/src/udev/collect/collect.c index b234792e237..b6c95cd4524 100644 --- a/src/udev/collect/collect.c +++ b/src/udev/collect/collect.c @@ -24,6 +24,7 @@ #include #include +#include "alloc-util.h" #include "libudev-private.h" #include "macro.h" #include "string-util.h" diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index 972841b6d9b..776674e9945 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -24,6 +24,7 @@ #include "sd-netlink.h" +#include "alloc-util.h" #include "conf-files.h" #include "conf-parser.h" #include "ethtool-util.h" diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c index 0976525eb32..d0e47ec6d88 100644 --- a/src/udev/udev-builtin-blkid.c +++ b/src/udev/udev-builtin-blkid.c @@ -29,6 +29,7 @@ #include "sd-id128.h" +#include "alloc-util.h" #include "efivars.h" #include "fd-util.h" #include "gpt.h" diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c index 97a5a9c77f1..f4a065a97d8 100644 --- a/src/udev/udev-builtin-hwdb.c +++ b/src/udev/udev-builtin-hwdb.c @@ -24,6 +24,7 @@ #include "sd-hwdb.h" +#include "alloc-util.h" #include "hwdb-util.h" #include "string-util.h" #include "udev-util.h" diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c index d4589470fb4..f72894b5c58 100644 --- a/src/udev/udev-builtin-net_setup_link.c +++ b/src/udev/udev-builtin-net_setup_link.c @@ -19,9 +19,10 @@ along with systemd; If not, see . ***/ +#include "alloc-util.h" #include "link-config.h" -#include "udev.h" #include "log.h" +#include "udev.h" static link_config_ctx *ctx = NULL; diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c index 2c40988c7aa..1e190140b2f 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -30,6 +30,7 @@ #include #include +#include "alloc-util.h" #include "string-util.h" #include "udev.h" diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c index cb531bd1685..587649eff0a 100644 --- a/src/udev/udev-builtin-usb_id.c +++ b/src/udev/udev-builtin-usb_id.c @@ -29,6 +29,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "string-util.h" #include "udev.h" diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c index 937fc4ecd86..1e05be51a54 100644 --- a/src/udev/udev-ctrl.c +++ b/src/udev/udev-ctrl.c @@ -18,6 +18,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "formats-util.h" #include "socket-util.h" diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index bf122f85c75..6b4bd31281e 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -30,6 +30,7 @@ #include #include +#include "alloc-util.h" #include "event-util.h" #include "fd-util.h" #include "formats-util.h" diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 7d5f473d457..c06ace09cf1 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -29,6 +29,7 @@ #include #include +#include "alloc-util.h" #include "conf-files.h" #include "escape.h" #include "fd-util.h" diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c index 87468c43aef..031a099d77b 100644 --- a/src/udev/udevadm-hwdb.c +++ b/src/udev/udevadm-hwdb.c @@ -22,6 +22,7 @@ #include #include +#include "alloc-util.h" #include "conf-files.h" #include "fileio.h" #include "fs-util.h" diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 60fc3179b0b..2c152129cce 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -43,6 +43,7 @@ #include "sd-daemon.h" #include "sd-event.h" +#include "alloc-util.h" #include "cgroup-util.h" #include "cpu-set-util.h" #include "dev-setup.h" diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c index bcabf65a36d..d50063cbcdd 100644 --- a/src/update-utmp/update-utmp.c +++ b/src/update-utmp/update-utmp.c @@ -29,15 +29,16 @@ #include "sd-bus.h" +#include "alloc-util.h" +#include "bus-error.h" +#include "bus-util.h" +#include "formats-util.h" #include "log.h" #include "macro.h" -#include "util.h" #include "special.h" -#include "utmp-wtmp.h" -#include "bus-util.h" -#include "bus-error.h" #include "unit-name.h" -#include "formats-util.h" +#include "util.h" +#include "utmp-wtmp.h" typedef struct Context { sd_bus *bus; diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index 2da28f8be06..2298f1c2a99 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -31,6 +31,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "fileio.h" #include "io-util.h" -- 2.39.5