Rename the stat struct used internally by strace to strace_stat_t

* largefile_wrappers.h (struct_stat): Rename to strace_stat_t.
* strace.c (startup_child): Rename struct_stat to strace_stat_t.
* util.c (printdev): Likewise.

diff --git a/largefile_wrappers.h b/largefile_wrappers.h
index fc178006411665cbd4b2d6cc96574407d76db1ac..630aafbce7ccd4f1a7e43060097f4f28e2e7a1ff 100644 (file)
--- a/largefile_wrappers.h
+++ b/largefile_wrappers.h
@@ -24,7 +24,7 @@
 #  else
 #   define fopen_stream fopen
 #  endif
-#  define struct_stat struct stat64
+#  define strace_stat_t struct stat64
 #  define stat_file stat64
 #  define struct_dirent struct dirent64
 #  define read_dir readdir64
@@ -33,7 +33,7 @@
 # else
 #  define open_file open
 #  define fopen_stream fopen
-#  define struct_stat struct stat
+#  define strace_stat_t struct stat
 #  define stat_file stat
 #  define struct_dirent struct dirent
 #  define read_dir readdir

diff --git a/strace.c b/strace.c
index ca8d558c97b021569c09fee12b52cf94db60e04a..318b1409eeaa47c8d7f2fe5ac849ffed79ce9a2c 100644 (file)
--- a/strace.c
+++ b/strace.c
@@ -1276,7 +1276,7 @@ redirect_standard_fds(void)
 static void
 startup_child(char **argv)
 {
-       struct_stat statbuf;
+       strace_stat_t statbuf;
        const char *filename;
        size_t filename_len;
        char pathname[PATH_MAX];

diff --git a/util.c b/util.c
index 7dec473f06a721f8d67f549c88a172f488ff464a..fa384c59784f171b058b0dde734ffc6f24894ac9 100644 (file)
--- a/util.c
+++ b/util.c
@@ -455,7 +455,7 @@ printsocket(struct tcb *tcp, int fd, const char *path)
 static bool
 printdev(struct tcb *tcp, int fd, const char *path)
 {
-       struct_stat st;
+       strace_stat_t st;
 
        if (path[0] != '/')
                return false;