From: Eugene Syromyatnikov <evgsyr@gmail.com>
Date: Mon, 28 Nov 2016 09:26:13 +0000 (+0300)
Subject: utime: fix omission of field names in utimbuf structure printing
X-Git-Tag: v4.15~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=922712f8ff1daab719ee35682ddf7230ef1c15a3;p=strace

utime: fix omission of field names in utimbuf structure printing

* utime.c (SYS_FUNC(utime)): Print struct utimbuf as a structure,
not as an array (use curly brackets instead of square ones).
Add field names to the output.
* tests/utime.c (main): Update expected output.
---

diff --git a/tests/utime.c b/tests/utime.c
index ef40d1bd..91044705 100644
--- a/tests/utime.c
+++ b/tests/utime.c
@@ -54,11 +54,11 @@ main(void)
 
 	rc = utime("utime\nfilename", tail_u);
 	const char *errstr = sprintrc(rc);
-	printf("utime(\"utime\\nfilename\", [");
+	printf("utime(\"utime\\nfilename\", {actime=");
 	print_tm(p);
-	printf(", ");
+	printf(", modtime=");
 	print_tm(p);
-	printf("]) = %s\n", errstr);
+	printf("}) = %s\n", errstr);
 
 	puts("+++ exited with 0 +++");
 	return 0;
diff --git a/utime.c b/utime.c
index 4f8f40a1..8126b350 100644
--- a/utime.c
+++ b/utime.c
@@ -15,8 +15,8 @@ SYS_FUNC(utime)
 	printpath(tcp, tcp->u_arg[0]);
 	tprints(", ");
 	if (!umove_or_printaddr(tcp, tcp->u_arg[1], &u)) {
-		tprintf("[%s,", sprinttime(u.actime));
-		tprintf(" %s]", sprinttime(u.modtime));
+		tprintf("{actime=%s,", sprinttime(u.actime));
+		tprintf(" modtime=%s}", sprinttime(u.modtime));
 	}
 
 	return RVAL_DECODED;