From: Eugene Syromyatnikov <evgsyr@gmail.com>
Date: Thu, 21 Feb 2019 15:49:35 +0000 (+0100)
Subject: Rename the stat struct used internally by strace to strace_stat_t
X-Git-Tag: v5.1~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67ab2868cfa4ed0d38ec9eb4b6b5e0fe1f14fe88;p=strace

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 fc178006..630aafbc 100644
--- 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 ca8d558c..318b1409 100644
--- 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 7dec473f..fa384c59 100644
--- 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;