From: Zev Weiss <zev@bewilderbeest.net>
Date: Sun, 24 Apr 2016 23:32:33 +0000 (-0500)
Subject: statfs: don't quote f_type macro names
X-Git-Tag: v4.12~295
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b587a5a1be8683b2055ddbb95cb38b7450be7675;p=strace

statfs: don't quote f_type macro names

* statfs.c (sprintfstype): Don't add double-quotes to fs magic macros.
* tests/statfs.expected: Remove double-quotes.
---

diff --git a/statfs.c b/statfs.c
index bd3c7ba1..882ee9c1 100644
--- a/statfs.c
+++ b/statfs.c
@@ -44,10 +44,8 @@ sprintfstype(const unsigned int magic)
 	const char *s;
 
 	s = xlat_search(fsmagic, ARRAY_SIZE(fsmagic), magic);
-	if (s) {
-		sprintf(buf, "\"%s\"", s);
-		return buf;
-	}
+	if (s)
+		return s;
 	sprintf(buf, "%#x", magic);
 	return buf;
 }
diff --git a/tests/statfs.expected b/tests/statfs.expected
index 93e2b515..f39013b8 100644
--- a/tests/statfs.expected
+++ b/tests/statfs.expected
@@ -1 +1 @@
-statfs(64)?\("/proc/self/status"(, [1-9][0-9]*)?, \{f_type="PROC_SUPER_MAGIC", f_bsize=[1-9][0-9]*, f_blocks=[0-9]+, f_bfree=[0-9]+, f_bavail=[0-9]+, f_files=[0-9]+, f_ffree=[0-9]+, f_fsid=\{[0-9]+, [0-9]+\}, f_namelen=[1-9][0-9]*(, f_frsize=[0-9]+)?(, f_flags=[0-9]+)?\}\) += 0
+statfs(64)?\("/proc/self/status"(, [1-9][0-9]*)?, \{f_type=PROC_SUPER_MAGIC, f_bsize=[1-9][0-9]*, f_blocks=[0-9]+, f_bfree=[0-9]+, f_bavail=[0-9]+, f_files=[0-9]+, f_ffree=[0-9]+, f_fsid=\{[0-9]+, [0-9]+\}, f_namelen=[1-9][0-9]*(, f_frsize=[0-9]+)?(, f_flags=[0-9]+)?\}\) += 0