diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2021-02-24 00:08:07 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2021-02-24 00:08:07 -0500 |
| commit | ed907b1df27111bb717e2aba7492547977c63049 (patch) | |
| tree | 1d1dbecb884bdae0d313e2e5c89a9c2f071b18e1 | |
| parent | 7e8d22814c41c375027a6183180af79a66d75e69 (diff) | |
| download | e2fsprogs-ed907b1df27111bb717e2aba7492547977c63049.tar.gz | |
libe2p: remove nested #ifdefs in fgetflags.c and fsetflags.c
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | lib/e2p/fgetflags.c | 21 | ||||
| -rw-r--r-- | lib/e2p/fsetflags.c | 15 |
2 files changed, 16 insertions, 20 deletions
diff --git a/lib/e2p/fgetflags.c b/lib/e2p/fgetflags.c index b2f7bf9c7..0f1a059e4 100644 --- a/lib/e2p/fgetflags.c +++ b/lib/e2p/fgetflags.c @@ -71,11 +71,16 @@ int fgetflags (const char * name, unsigned long * flags) #endif return 0; -#else /* !HAVE_STAT_FLAGS || (APPLE_DARWIN && HAVE_EXT2_IOCTLS) */ -#if HAVE_EXT2_IOCTLS +#elif APPLE_DARWIN && HAVE_EXT2_IOCTLS + int f, save_errno = 0; + + f = -1; + save_errno = syscall(SYS_fsctl, name, EXT2_IOC_GETFLAGS, &f, 0); + *flags = f; + return (save_errno); +#elif HAVE_EXT2_IOCTLS int fd, r, f, save_errno = 0; -#if !APPLE_DARWIN fd = open(name, OPEN_FLAGS); if (fd == -1) { if (errno == ELOOP || errno == ENXIO) @@ -93,14 +98,8 @@ int fgetflags (const char * name, unsigned long * flags) if (save_errno) errno = save_errno; return r; -#else /* APPLE_DARWIN */ - f = -1; - save_errno = syscall(SYS_fsctl, name, EXT2_IOC_GETFLAGS, &f, 0); - *flags = f; - return (save_errno); -#endif /* !APPLE_DARWIN */ -#endif /* HAVE_EXT2_IOCTLS */ -#endif +#else errno = EOPNOTSUPP; return -1; +#endif } diff --git a/lib/e2p/fsetflags.c b/lib/e2p/fsetflags.c index 795042baf..285155473 100644 --- a/lib/e2p/fsetflags.c +++ b/lib/e2p/fsetflags.c @@ -76,12 +76,13 @@ int fsetflags (const char * name, unsigned long flags) #endif return chflags (name, bsd_flags); -#else /* !HAVE_CHFLAGS || (APPLE_DARWIN && HAVE_EXT2_IOCTLS) */ -#if HAVE_EXT2_IOCTLS +#elif APPLE_DARWIN && HAVE_EXT2_IOCTLS + int f = (int) flags; + return syscall(SYS_fsctl, name, EXT2_IOC_SETFLAGS, &f, 0); +#elif HAVE_EXT2_IOCTLS int fd, r, f, save_errno = 0; struct stat buf; -#if !APPLE_DARWIN fd = open(name, OPEN_FLAGS); if (fd == -1) { if (errno == ELOOP || errno == ENXIO) @@ -99,12 +100,8 @@ int fsetflags (const char * name, unsigned long flags) if (save_errno) errno = save_errno; return r; -#else /* APPLE_DARWIN */ - f = (int) flags; - return syscall(SYS_fsctl, name, EXT2_IOC_SETFLAGS, &f, 0); -#endif /* !APPLE_DARWIN */ -#endif /* HAVE_EXT2_IOCTLS */ -#endif +#else errno = EOPNOTSUPP; return -1; +#endif } |