]> granicus.if.org Git - strace/commitdiff
Drop struct stat.st_aclcnt and stat.st_level support
authorDmitry V. Levin <ldv@altlinux.org>
Sun, 28 Dec 2014 17:27:33 +0000 (17:27 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Wed, 7 Jan 2015 22:05:38 +0000 (22:05 +0000)
Remove the code that supports struct stat.st_aclcnt and stat.st_level
decoding -- these fields are not defined in system headers.

* configure.ac (AC_CHECK_MEMBERS): Remove struct stat.st_aclcnt and
struct stat.st_level.
* file.c (realprintstat, printstat64)
[HAVE_STRUCT_STAT_ST_ACLCNT || HAVE_STRUCT_STAT_ST_LEVEL]: Remove.

configure.ac
file.c

index fbd8a83d360f15143e331688f964ff0597e496bb..5b0a38ff575f8e4118c6e591441b5de5d2b7a614 100644 (file)
@@ -184,13 +184,11 @@ AC_HEADER_STDBOOL
 AC_HEADER_DIRENT
 AC_HEADER_STAT
 AC_CHECK_MEMBERS(m4_normalize([
-       struct stat.st_aclcnt,
        struct stat.st_blksize,
        struct stat.st_blocks,
        struct stat.st_flags,
        struct stat.st_fstype,
        struct stat.st_gen,
-       struct stat.st_level,
        struct stat.st_rdev
 ]))
 AC_STAT64
diff --git a/file.c b/file.c
index 69e72b353a37367001398c3c741d61ccb8408d01..abc5c14402fd33a850aa6692140e070248f0ca38 100644 (file)
--- a/file.c
+++ b/file.c
@@ -420,12 +420,6 @@ realprintstat(struct tcb *tcp, struct stat *statbuf)
                tprints(", st_flags=");
                printflags(fileflags, statbuf->st_flags, "UF_???");
 #endif
-#if HAVE_STRUCT_STAT_ST_ACLCNT
-               tprintf(", st_aclcnt=%d", statbuf->st_aclcnt);
-#endif
-#if HAVE_STRUCT_STAT_ST_LEVEL
-               tprintf(", st_level=%ld", statbuf->st_level);
-#endif
 #if HAVE_STRUCT_STAT_ST_FSTYPE
                tprintf(", st_fstype=%.*s",
                        (int) sizeof statbuf->st_fstype, statbuf->st_fstype);
@@ -625,12 +619,6 @@ printstat64(struct tcb *tcp, long addr)
                tprints(", st_flags=");
                printflags(fileflags, statbuf.st_flags, "UF_???");
 #endif
-#if HAVE_STRUCT_STAT_ST_ACLCNT
-               tprintf(", st_aclcnt=%d", statbuf.st_aclcnt);
-#endif
-#if HAVE_STRUCT_STAT_ST_LEVEL
-               tprintf(", st_level=%ld", statbuf.st_level);
-#endif
 #if HAVE_STRUCT_STAT_ST_FSTYPE
                tprintf(", st_fstype=%.*s",
                        (int) sizeof statbuf.st_fstype, statbuf.st_fstype);