From: Dmitry V. Levin <ldv@altlinux.org>
Date: Thu, 26 May 2016 10:04:39 +0000 (+0000)
Subject: block.c: fix printing of struct blk_user_trace_setup
X-Git-Tag: v4.12~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bea528fa8ff7804f6aa3809e7e01d76034f38df;p=strace

block.c: fix printing of struct blk_user_trace_setup

* block.c (block_ioctl): Fix printing of comma before
struct blk_user_trace_setup.name on exiting syscall.
---

diff --git a/block.c b/block.c
index f4fefe28..755232aa 100644
--- a/block.c
+++ b/block.c
@@ -224,18 +224,11 @@ block_ioctl(struct tcb *tcp, const unsigned int code, const long arg)
 		} else {
 			struct blk_user_trace_setup buts;
 
-			if (syserror(tcp)) {
-				tprints("}");
-				break;
-			}
-			tprints(", ");
-			if (umove(tcp, arg, &buts) < 0) {
-				tprints("???}");
-				break;
+			if (!syserror(tcp) && !umove(tcp, arg, &buts)) {
+				tprints(", name=");
+				print_quoted_string(buts.name, sizeof(buts.name),
+						    QUOTE_0_TERMINATED);
 			}
-			tprints(", name=");
-			print_quoted_string(buts.name, sizeof(buts.name),
-					    QUOTE_0_TERMINATED);
 			tprints("}");
 			break;
 		}