diff options
Diffstat (limited to 'e2fsprogs/e2fs_lib.c')
-rw-r--r-- | e2fsprogs/e2fs_lib.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/e2fsprogs/e2fs_lib.c b/e2fsprogs/e2fs_lib.c index ea5c8026c..890cb302b 100644 --- a/e2fsprogs/e2fs_lib.c +++ b/e2fsprogs/e2fs_lib.c | |||
@@ -12,11 +12,11 @@ | |||
12 | #define HAVE_EXT2_IOCTLS 1 | 12 | #define HAVE_EXT2_IOCTLS 1 |
13 | 13 | ||
14 | #if INT_MAX == LONG_MAX | 14 | #if INT_MAX == LONG_MAX |
15 | #define IF_LONG_IS_SAME(x) x | 15 | #define IF_LONG_IS_SAME(...) __VA_ARGS__ |
16 | #define IF_LONG_IS_WIDER(x) | 16 | #define IF_LONG_IS_WIDER(...) |
17 | #else | 17 | #else |
18 | #define IF_LONG_IS_SAME(x) | 18 | #define IF_LONG_IS_SAME(...) |
19 | #define IF_LONG_IS_WIDER(x) x | 19 | #define IF_LONG_IS_WIDER(...) __VA_ARGS__ |
20 | #endif | 20 | #endif |
21 | 21 | ||
22 | static void close_silently(int fd) | 22 | static void close_silently(int fd) |
@@ -147,6 +147,8 @@ struct flags_name { | |||
147 | const char *long_name; | 147 | const char *long_name; |
148 | }; | 148 | }; |
149 | 149 | ||
150 | /* TODO: apart from I and (disabled) COMPRESSION flags, this | ||
151 | * is a duplicate of a table from chattr. Merge? */ | ||
150 | static const struct flags_name flags_array[] = { | 152 | static const struct flags_name flags_array[] = { |
151 | { EXT2_SECRM_FL, 's', "Secure_Deletion" }, | 153 | { EXT2_SECRM_FL, 's', "Secure_Deletion" }, |
152 | { EXT2_UNRM_FL, 'u' , "Undelete" }, | 154 | { EXT2_UNRM_FL, 'u' , "Undelete" }, |