SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

include: move trivial kernel header wrappers to src/include/override/

Browse Source
This commit is contained in:
Yu Watanabe
2025-07-11 13:05:46 +09:00
parent 543a48b653
commit 3fc2a44043
40 changed files with 79 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/cgroup-util.c
+2 -2
View File
@@ -1,5 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/fs.h>
#include <linux/magic.h>
#include <signal.h>
#include <stdlib.h>
#include <sys/xattr.h>
@@ -18,8 +20,6 @@
#include "fs-util.h"
#include "log.h"
#include "login-util.h"
#include "missing_fs.h"
#include "missing_magic.h"
#include "parse-util.h"
#include "path-util.h"
#include "pidref.h"
src/basic/check-filesystems.sh
+3 -8
View File
@@ -3,19 +3,14 @@
set -eu
set -o pipefail
cpp="$1"
filesystems_gperf="$2"
cpp="${1:?}"
filesystems_gperf="${2:?}"
shift 2
includes=""
for i in "$@"; do
includes="$includes -include $i"
done
error=false
# shellcheck disable=SC2086
for fs in $($cpp -dM $includes - </dev/null | \
for fs in $($cpp -dM -include linux/magic.h "$@" - </dev/null | \
grep -E '_MAGIC' | \
grep -vE 'LINUX_MAGIC' | \
awk '/^#define[ \t]+[A-Z0-9_]+MAGIC[ \t]+/ { print $2; }'); do
src/basic/filesystems-gperf.gperf
-1
View File
@@ -6,7 +6,6 @@ _Pragma("GCC diagnostic ignored \"-Wzero-as-null-pointer-constant\"")
#include <linux/magic.h>
#include "filesystems.h"
#include "missing_magic.h"
#include "stat-util.h"
struct FilesystemMagic {
src/basic/meson.build
+3 -9
View File
@@ -119,8 +119,6 @@ basic_sources = files(
sources += basic_sources
missing_audit_h = files('missing_audit.h')
generated_gperf_headers = []
foreach item : [
# name, source, struct name, prefix, headers
@@ -173,17 +171,13 @@ basic_sources += generated_gperf_headers
############################################################
filesystem_includes = files(
'../include/uapi/linux/magic.h',
'missing_magic.h',
)
check_filesystems = find_program('check-filesystems.sh')
r = run_command(
[
'env', '--chdir', meson.project_build_root(),
check_filesystems, cpp, files('filesystems-gperf.gperf')
] + filesystem_includes,
check_filesystems, cpp, files('filesystems-gperf.gperf'),
system_include_args,
],
check: false,
)
if r.returncode() != 0
src/basic/namespace-util.c
+2 -2
View File
@@ -1,6 +1,8 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <linux/magic.h>
#include <linux/nsfs.h>
#include <sched.h>
#include <sys/ioctl.h>
#include <sys/mount.h>
@@ -10,8 +12,6 @@
#include "fd-util.h"
#include "fileio.h"
#include "log.h"
#include "missing_magic.h"
#include "missing_namespace.h"
#include "mountpoint-util.h"
#include "namespace-util.h"
#include "parse-util.h"
src/basic/pidfd-util.c
+2 -2
View File
@@ -1,5 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/fs.h>
#include <linux/magic.h>
#include <sys/ioctl.h>
#include <threads.h>
#include <unistd.h>
@@ -7,8 +9,6 @@
#include "errno-util.h"
#include "fd-util.h"
#include "fileio.h"
#include "missing_fs.h"
#include "missing_magic.h"
#include "mountpoint-util.h"
#include "parse-util.h"
#include "pidfd-util.h"
src/basic/stat-util.c
+1 -1
View File
@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <linux/magic.h>
#include <sys/statvfs.h>
#include <unistd.h>
@@ -13,7 +14,6 @@
#include "fs-util.h"
#include "hash-funcs.h"
#include "log.h"
#include "missing_magic.h"
#include "mountpoint-util.h"
#include "path-util.h"
#include "siphash24.h"
src/basic/terminal-util.c
+1 -1
View File
@@ -2,6 +2,7 @@
#include <fcntl.h>
#include <linux/kd.h>
#include <linux/magic.h>
#include <linux/tiocl.h>
#include <linux/vt.h>
#include <poll.h>
@@ -27,7 +28,6 @@
#include "inotify-util.h"
#include "io-util.h"
#include "log.h"
#include "missing_magic.h"
#include "namespace-util.h"
#include "parse-util.h"
#include "path-util.h"
src/core/bpf-foreign.c
+1 -1
View File
@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/bpf.h>
#include <linux/magic.h>
#include "alloc-util.h"
#include "bpf-foreign.h"
@@ -8,7 +9,6 @@
#include "cgroup.h"
#include "hash-funcs.h"
#include "hashmap.h"
#include "missing_magic.h"
#include "siphash24.h"
#include "stat-util.h"
#include "unit.h"
src/core/namespace.c
+1 -1
View File
@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/loop.h>
#include <linux/magic.h>
#include <sched.h>
#include <stdio.h>
#include <stdlib.h>
@@ -29,7 +30,6 @@
#include "log.h"
#include "loop-util.h"
#include "loopback-setup.h"
#include "missing_magic.h"
#include "mkdir-label.h"
#include "mount-util.h"
#include "mountpoint-util.h"
src/core/service.c
+1 -1
View File
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/audit.h>
#include <math.h>
#include <sys/stat.h>
#include <unistd.h>
@@ -31,7 +32,6 @@
#include "image-policy.h"
#include "log.h"
#include "manager.h"
#include "missing_audit.h"
#include "mount-util.h"
#include "namespace.h"
#include "open-file.h"
src/creds/creds.c
+1 -1
View File
@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <getopt.h>
#include <linux/magic.h>
#include <unistd.h>
#include "sd-json.h"
@@ -23,7 +24,6 @@
#include "log.h"
#include "main-func.h"
#include "memory-util.h"
#include "missing_magic.h"
#include "pager.h"
#include "parse-argument.h"
#include "parse-util.h"
src/home/homework-luks.c
+1 -1
View File
@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/loop.h>
#include <linux/magic.h>
#include <poll.h>
#include <sys/file.h>
#include <sys/ioctl.h>
@@ -45,7 +46,6 @@
#include "keyring-util.h"
#include "loop-util.h"
#include "memory-util.h"
#include "missing_magic.h"
#include "mkdir.h"
#include "mkfs-util.h"
#include "openssl-util.h"
src/home/homework-quota.c
+2 -1
View File
@@ -1,5 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/magic.h>
#include "btrfs-util.h"
#include "errno-util.h"
#include "fd-util.h"
@@ -7,7 +9,6 @@
#include "homework-quota.h"
#include "log.h"
#include "memory-util.h"
#include "missing_magic.h"
#include "quota-util.h"
#include "stat-util.h"
#include "user-record.h"
src/home/homework.c
+1 -1
View File
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/magic.h>
#include <stdlib.h>
#include <sys/mount.h>
#include <unistd.h>
@@ -35,7 +36,6 @@
#include "loop-util.h"
#include "main-func.h"
#include "memory-util.h"
#include "missing_magic.h"
#include "mount-util.h"
#include "path-util.h"
#include "recovery-key.h"
src/include/meson.build
+5
View File
@@ -33,6 +33,11 @@ ipproto_sources = files(
'uapi/linux/in.h',
)
# Source files that provides AUDIT_XYZ
audit_sources = files(
'override/linux/audit.h',
)
# Source files that provides KEY_XYZ
keyboard_sources = files(
'uapi/linux/input.h',
src/basic/missing_audit.h → src/include/override/linux/audit.h
+7 -5
View File
@@ -1,13 +1,15 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <linux/audit.h> /* IWYU pragma: export */
#include_next <linux/audit.h> /* IWYU pragma: export */
#if HAVE_AUDIT
# include <libaudit.h> /* IWYU pragma: export */
#endif
/* We use _Static_assert() directly here instead of assert_cc()
#include <assert.h>
/* We use static_assert() directly here instead of assert_cc()
* because if we include macro.h in this header, the invocation
* of generate-audit_type-list.sh becomes more complex.
*/
@@ -15,17 +17,17 @@
#ifndef AUDIT_SERVICE_START
# define AUDIT_SERVICE_START 1130 /* Service (daemon) start */
#else
_Static_assert(AUDIT_SERVICE_START == 1130, "");
static_assert(AUDIT_SERVICE_START == 1130, "");
#endif
#ifndef AUDIT_SERVICE_STOP
# define AUDIT_SERVICE_STOP 1131 /* Service (daemon) stop */
#else
_Static_assert(AUDIT_SERVICE_STOP == 1131, "");
static_assert(AUDIT_SERVICE_STOP == 1131, "");
#endif
#ifndef MAX_AUDIT_MESSAGE_LENGTH
# define MAX_AUDIT_MESSAGE_LENGTH 8970
#else
_Static_assert(MAX_AUDIT_MESSAGE_LENGTH == 8970, "");
static_assert(MAX_AUDIT_MESSAGE_LENGTH == 8970, "");
#endif
src/basic/missing_fs.h → src/include/override/linux/fs.h
+1 -1
View File
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <linux/fs.h> /* IWYU pragma: export */
#include_next <linux/fs.h> /* IWYU pragma: export */
/* Not exposed yet. Defined at fs/ext4/ext4.h */
#ifndef EXT4_IOC_RESIZE_FS
src/basic/missing_magic.h → src/include/override/linux/magic.h
+17 -15
View File
@@ -1,102 +1,104 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <linux/magic.h> /* IWYU pragma: export */
#include_next <linux/magic.h> /* IWYU pragma: export */
#include <assert.h>
/* Not exposed yet (4.20). Defined at ipc/mqueue.c */
#ifndef MQUEUE_MAGIC
# define MQUEUE_MAGIC 0x19800202
#else
assert_cc(MQUEUE_MAGIC == 0x19800202);
static_assert(MQUEUE_MAGIC == 0x19800202, "");
#endif
/* b1123ea6d3b3da25af5c8a9d843bd07ab63213f4 (4.8), dropped by 68f2736a858324c3ec852f6c2cddd9d1c777357d (v6.0) */
#ifndef BALLOON_KVM_MAGIC
# define BALLOON_KVM_MAGIC 0x13661366
#else
assert_cc(BALLOON_KVM_MAGIC == 0x13661366);
static_assert(BALLOON_KVM_MAGIC == 0x13661366, "");
#endif
/* 48b4800a1c6af2cdda344ea4e2c843dcc1f6afc9 (4.8), dropped by 68f2736a858324c3ec852f6c2cddd9d1c777357d (v6.0) */
#ifndef ZSMALLOC_MAGIC
# define ZSMALLOC_MAGIC 0x58295829
#else
assert_cc(ZSMALLOC_MAGIC == 0x58295829);
static_assert(ZSMALLOC_MAGIC == 0x58295829, "");
#endif
/* ea8157ab2ae5e914dd427e5cfab533b6da3819cd (5.3), dropped by 68f2736a858324c3ec852f6c2cddd9d1c777357d (v6.0) */
#ifndef Z3FOLD_MAGIC
# define Z3FOLD_MAGIC 0x33
#else
assert_cc(Z3FOLD_MAGIC == 0x33);
static_assert(Z3FOLD_MAGIC == 0x33, "");
#endif
/* fe030c9b85e6783bc52fe86449c0a4b8aa16c753 (5.5), dropped by 68f2736a858324c3ec852f6c2cddd9d1c777357d (v6.0) */
#ifndef PPC_CMM_MAGIC
# define PPC_CMM_MAGIC 0xc7571590
#else
assert_cc(PPC_CMM_MAGIC == 0xc7571590);
static_assert(PPC_CMM_MAGIC == 0xc7571590, "");
#endif
/* Not in mainline but included in Ubuntu */
#ifndef SHIFTFS_MAGIC
# define SHIFTFS_MAGIC 0x6a656a62
#else
assert_cc(SHIFTFS_MAGIC == 0x6a656a62);
static_assert(SHIFTFS_MAGIC == 0x6a656a62, "");
#endif
/* Not exposed yet. Defined at fs/fuse/control.c */
#ifndef FUSE_CTL_SUPER_MAGIC
# define FUSE_CTL_SUPER_MAGIC 0x65735543
#else
assert_cc(FUSE_CTL_SUPER_MAGIC == 0x65735543);
static_assert(FUSE_CTL_SUPER_MAGIC == 0x65735543, "");
#endif
/* Not exposed yet. Defined at fs/orangefs/orangefs-kernel.h */
#ifndef ORANGEFS_DEVREQ_MAGIC
# define ORANGEFS_DEVREQ_MAGIC 0x20030529
#else
assert_cc(ORANGEFS_DEVREQ_MAGIC == 0x20030529);
static_assert(ORANGEFS_DEVREQ_MAGIC == 0x20030529, "");
#endif
/* linux/gfs2_ondisk.h */
#ifndef GFS2_MAGIC
# define GFS2_MAGIC 0x01161970
#else
assert_cc(GFS2_MAGIC == 0x01161970);
static_assert(GFS2_MAGIC == 0x01161970, "");
#endif
/* Not exposed yet. Defined at fs/configfs/mount.c */
#ifndef CONFIGFS_MAGIC
# define CONFIGFS_MAGIC 0x62656570
#else
assert_cc(CONFIGFS_MAGIC == 0x62656570);
static_assert(CONFIGFS_MAGIC == 0x62656570, "");
#endif
/* Not exposed yet. Defined at fs/vboxsf/super.c */
#ifndef VBOXSF_SUPER_MAGIC
# define VBOXSF_SUPER_MAGIC 0x786f4256
#else
assert_cc(VBOXSF_SUPER_MAGIC == 0x786f4256);
static_assert(VBOXSF_SUPER_MAGIC == 0x786f4256, "");
#endif
/* Not exposed yet, internally actually called RPCAUTH_GSSMAGIC. Defined in net/sunrpc/rpc_pipe.c */
#ifndef RPC_PIPEFS_SUPER_MAGIC
# define RPC_PIPEFS_SUPER_MAGIC 0x67596969
#else
assert_cc(RPC_PIPEFS_SUPER_MAGIC == 0x67596969);
static_assert(RPC_PIPEFS_SUPER_MAGIC == 0x67596969, "");
#endif
/* Not exposed yet, defined at fs/ntfs/ntfs.h */
#ifndef NTFS_SB_MAGIC
# define NTFS_SB_MAGIC 0x5346544e
#else
assert_cc(NTFS_SB_MAGIC == 0x5346544e);
static_assert(NTFS_SB_MAGIC == 0x5346544e, "");
#endif
/* Not exposed yet, encoded literally in fs/ntfs3/super.c. */
#ifndef NTFS3_SUPER_MAGIC
# define NTFS3_SUPER_MAGIC 0x7366746e
#else
assert_cc(NTFS3_SUPER_MAGIC == 0x7366746e);
static_assert(NTFS3_SUPER_MAGIC == 0x7366746e, "");
#endif
src/basic/missing_namespace.h → src/include/override/linux/nsfs.h
+1 -2
View File
@@ -1,8 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <linux/nsfs.h> /* IWYU pragma: export */
#include <linux/types.h>
#include_next <linux/nsfs.h> /* IWYU pragma: export */
/* Root namespace inode numbers, as per include/linux/proc_ns.h in the kernel source tree, since v3.8:
* https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=98f842e675f96ffac96e6c50315790912b2812be */
src/basic/missing_xfs.h → src/include/override/linux/xfs.h
+2 -1
View File
@@ -1,7 +1,8 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "forward.h"
#include <linux/ioctl.h>
#include <stdint.h>
/* This is currently not exported in the public kernel headers, but the libxfs library code part of xfsprogs
* defines it as public header */
src/journal/journald-audit.c
+2 -1
View File
@@ -1,5 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/audit.h>
#include "sd-event.h"
#include "alloc-util.h"
@@ -13,7 +15,6 @@
#include "journald-manager.h"
#include "log.h"
#include "log-ratelimit.h"
#include "missing_audit.h"
#include "stdio-util.h"
#include "string-util.h"
#include "time-util.h"
src/journal/journald-manager.c
+1 -1
View File
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/audit.h>
#include <linux/sockios.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
@@ -50,7 +51,6 @@
#include "log.h"
#include "log-ratelimit.h"
#include "memory-util.h"
#include "missing_audit.h"
#include "mkdir.h"
#include "parse-util.h"
#include "path-util.h"
src/libsystemd/sd-daemon/sd-daemon.c
+1 -1
View File
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/magic.h>
#include <mqueue.h>
#include <netinet/in.h>
#include <poll.h>
@@ -18,7 +19,6 @@
#include "io-util.h"
#include "iovec-util.h"
#include "log.h"
#include "missing_magic.h"
#include "parse-util.h"
#include "path-util.h"
#include "pidfd-util.h"
src/libsystemd/sd-device/sd-device.c
+1 -1
View File
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/magic.h>
#include <unistd.h>
#include "sd-device.h"
@@ -19,7 +20,6 @@
#include "fileio.h"
#include "fs-util.h"
#include "hashmap.h"
#include "missing_magic.h"
#include "netlink-util.h"
#include "parse-util.h"
#include "path-util.h"
src/libsystemd/sd-event/sd-event.c
+1 -1
View File
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/magic.h>
#include <malloc.h>
#include <stdlib.h>
#include <sys/timerfd.h>
@@ -24,7 +25,6 @@
#include "log.h"
#include "logarithm.h"
#include "memory-util.h"
#include "missing_magic.h"
#include "origin-id.h"
#include "path-util.h"
#include "pidfd-util.h"
src/libsystemd/sd-journal/audit-type.c
+2 -1
View File
@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/audit.h>
#include "audit-type.h"
#include "missing_audit.h"
#include "audit_type-to-name.inc"
src/libsystemd/sd-journal/generate-audit_type-list.sh
+1 -4
View File
@@ -6,10 +6,7 @@ set -o pipefail
CC="${1:?}"
shift
HEADER="${1:?}"
shift
$CC -dM -include "$HEADER" "$@" - </dev/null | \
$CC -dM -include linux/audit.h "$@" - </dev/null | \
grep -vE 'AUDIT_.*(FIRST|LAST)_' | \
sed -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | \
sort -k2
src/libsystemd/sd-journal/meson.build
+2 -2
View File
@@ -14,9 +14,9 @@
generate_audit_type_list = files('generate-audit_type-list.sh')
audit_type_list_txt = custom_target(
input : [generate_audit_type_list, missing_audit_h],
input : [generate_audit_type_list, audit_sources],
output : 'audit_type-list.txt',
command : [env, 'bash', generate_audit_type_list, cpp, missing_audit_h, system_include_args],
command : [env, 'bash', generate_audit_type_list, cpp, system_include_args],
capture : true)
audit_type_to_name = custom_target(
src/login/user-runtime-dir.c
+1 -1
View File
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/magic.h>
#include <sys/mount.h>
#include "sd-bus.h"
@@ -15,7 +16,6 @@
#include "limits-util.h"
#include "log.h"
#include "main-func.h"
#include "missing_magic.h"
#include "mkdir-label.h"
#include "mount-util.h"
#include "mountpoint-util.h"
src/nsresourced/nsresourcework.c
+1 -1
View File
@@ -2,6 +2,7 @@
#include <fcntl.h>
#include <linux/if_tun.h>
#include <linux/magic.h>
#include <linux/nsfs.h>
#include <linux/veth.h>
#include <net/if.h>
@@ -30,7 +31,6 @@
#include "io-util.h"
#include "json-util.h"
#include "main-func.h"
#include "missing_magic.h"
#include "mountpoint-util.h"
#include "namespace-util.h"
#include "netlink-util.h"
src/nsresourced/userns-registry.c
+1 -1
View File
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/magic.h>
#include <unistd.h>
#include "sd-json.h"
@@ -13,7 +14,6 @@
#include "format-util.h"
#include "fs-util.h"
#include "json-util.h"
#include "missing_magic.h"
#include "path-util.h"
#include "recurse-dir.h"
#include "rm-rf.h"
src/shared/binfmt-util.c
+1 -1
View File
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/magic.h>
#include <sys/vfs.h>
#include "binfmt-util.h"
@@ -8,7 +9,6 @@
#include "fileio.h"
#include "fs-util.h"
#include "log.h"
#include "missing_magic.h"
#include "stat-util.h"
int binfmt_mounted_and_writable(void) {
src/shared/cgroup-setup.c
+1 -1
View File
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/magic.h>
#include <unistd.h>
#include "cgroup-setup.h"
@@ -10,7 +11,6 @@
#include "format-util.h"
#include "fs-util.h"
#include "log.h"
#include "missing_magic.h"
#include "mkdir.h"
#include "parse-util.h"
#include "path-util.h"
src/shared/machine-pool.c
+2 -1
View File
@@ -1,12 +1,13 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/magic.h>
#include "sd-bus.h"
#include "btrfs-util.h"
#include "label-util.h"
#include "log.h"
#include "machine-pool.h"
#include "missing_magic.h"
#include "stat-util.h"
static int check_btrfs(void) {
src/shared/resize-fs.c
+2 -3
View File
@@ -1,13 +1,12 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/btrfs.h>
#include <linux/fs.h>
#include <linux/magic.h>
#include <linux/xfs.h>
#include <sys/ioctl.h>
#include <sys/vfs.h>
#include "missing_fs.h"
#include "missing_magic.h"
#include "missing_xfs.h"
#include "resize-fs.h"
#include "stat-util.h"
#include "stdio-util.h"
src/shared/rm-rf.c
+1 -1
View File
@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <linux/magic.h>
#include <unistd.h>
#include "alloc-util.h"
@@ -10,7 +11,6 @@
#include "fd-util.h"
#include "fs-util.h"
#include "log.h"
#include "missing_magic.h"
#include "mountpoint-util.h"
#include "path-util.h"
#include "rm-rf.h"
src/shared/shift-uid.c
+1 -1
View File
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/magic.h>
#include <sys/statvfs.h>
#include <unistd.h>
@@ -10,7 +11,6 @@
#include "fileio.h"
#include "fs-util.h"
#include "log.h"
#include "missing_magic.h"
#include "shift-uid.h"
#include "stat-util.h"
#include "string-util.h"
src/sysupdate/sysupdate-resource.c
+1 -1
View File
@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <linux/magic.h>
#include <sys/stat.h>
#include <unistd.h>
@@ -20,7 +21,6 @@
#include "gpt.h"
#include "hexdecoct.h"
#include "import-util.h"
#include "missing_magic.h"
#include "process-util.h"
#include "sort-util.h"
#include "stat-util.h"
src/test/test-recurse-dir.c
+1 -1
View File
@@ -1,10 +1,10 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <ftw.h>
#include <linux/magic.h>
#include "fd-util.h"
#include "log.h"
#include "missing_magic.h"
#include "recurse-dir.h"
#include "stat-util.h"
#include "strv.h"