Skip to content

Commit 510de7f

Browse files
committed
Use integer constants for filesystem magic values.
Apparently, some of the magic constant macros are not defined on some systems (specifically, in Ubuntu 18.04). Just use literal constants instead.
1 parent 6c64d75 commit 510de7f

1 file changed

Lines changed: 3 additions & 7 deletions

File tree

src/operations.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -984,13 +984,9 @@ int check_fs_type(int infile, int outfile, uintmax_t size, std::size_t blksize)
984984

985985
if (BOOST_UNLIKELY(sfs.f_type == PROC_SUPER_MAGIC ||
986986
sfs.f_type == SYSFS_MAGIC ||
987-
#if defined(CGROUP2_SUPER_MAGIC)
988-
sfs.f_type == CGROUP2_SUPER_MAGIC ||
989-
#endif
990-
#if defined(CGROUP_SUPER_MAGIC)
991-
sfs.f_type == CGROUP_SUPER_MAGIC ||
992-
#endif
993-
sfs.f_type == SECURITYFS_MAGIC ||
987+
sfs.f_type == 0x63677270 || // CGROUP2_SUPER_MAGIC
988+
sfs.f_type == 0x0027e0eb || // CGROUP_SUPER_MAGIC
989+
sfs.f_type == 0x73636673 || // SECURITYFS_MAGIC
994990
sfs.f_type == 0x62656570 || // CONFIGFS_MAGIC
995991
sfs.f_type == TRACEFS_MAGIC ||
996992
sfs.f_type == DEBUGFS_MAGIC))

0 commit comments

Comments
 (0)