From: Eugene Syromyatnikov <evgsyr@gmail.com>
Date: Sun, 17 Jun 2018 21:34:37 +0000 (+0200)
Subject: aio: make iocb array output more strucutred
X-Git-Tag: v4.24~70
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc8a91c1157b2f76ded297c25062186f38310df3;p=strace

aio: make iocb array output more strucutred

* aio.c (print_iocb): Print curly brackets.
(print_iocbp): Do not print curly brackets.
* tests/aio.c: Update expected output.
---

diff --git a/aio.c b/aio.c
index 6357c6c1..a07d8eb2 100644
--- a/aio.c
+++ b/aio.c
@@ -125,6 +125,8 @@ print_iocb_header(struct tcb *tcp, const struct iocb *cb)
 static void
 print_iocb(struct tcb *tcp, const struct iocb *cb)
 {
+	tprints("{");
+
 	enum iocb_sub sub = print_iocb_header(tcp, cb);
 
 	switch (sub) {
@@ -156,6 +158,8 @@ print_iocb(struct tcb *tcp, const struct iocb *cb)
 	case SUB_NONE:
 		break;
 	}
+
+	tprints("}");
 }
 
 static bool
@@ -170,10 +174,8 @@ print_iocbp(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 		addr = *(kernel_ulong_t *) elem_buf;
 	}
 
-	tprints("{");
 	if (!umove_or_printaddr(tcp, addr, &cb))
 		print_iocb(tcp, &cb);
-	tprints("}");
 
 	return true;
 }
diff --git a/tests/aio.c b/tests/aio.c
index ea18700f..ba09cbb1 100644
--- a/tests/aio.c
+++ b/tests/aio.c
@@ -335,7 +335,7 @@ main(void)
 	       "}, {aio_key=%u, aio_lio_opcode=IOCB_CMD_PWRITEV"
 		", aio_reqprio=%hd, aio_fildes=%d, aio_buf=%#" PRI__x64
 		", aio_nbytes=%" PRI__u64 ", aio_offset=%" PRI__d64
-	       "}, {NULL}, {%#lx}, ... /* %p */]) = %s\n",
+	       "}, NULL, %#lx, ... /* %p */]) = %s\n",
 	       *ctx, 1057L,
 	       cbv2[0].aio_data, cbv2[0].aio_key,
 	       cbv2[0].aio_lio_opcode, cbv2[0].aio_fildes,