From: Dmitry V. Levin <ldv@altlinux.org>
Date: Sun, 9 Jul 2017 16:04:24 +0000 (+0000)
Subject: msghdr: use PRINT_FIELD_* macros
X-Git-Tag: v4.19~295
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=989744583d2fbff31004f07913dda3234e5abc31;p=strace

msghdr: use PRINT_FIELD_* macros

* msghdr.c (print_scm_creds): Use PRINT_FIELD_U and PRINT_FIELD_UID.
(print_cmsg_ip_recverr): Use PRINT_FIELD_U.
(print_struct_msghdr): Use PRINT_FIELD_U and PRINT_FIELD_FLAGS.
---

diff --git a/msghdr.c b/msghdr.c
index 22ba0d28..14b0a8d1 100644
--- a/msghdr.c
+++ b/msghdr.c
@@ -85,8 +85,10 @@ print_scm_creds(struct tcb *tcp, const void *cmsg_data,
 {
 	const struct ucred *uc = cmsg_data;
 
-	tprintf("{pid=%u, uid=%u, gid=%u}",
-		(unsigned) uc->pid, (unsigned) uc->uid, (unsigned) uc->gid);
+	PRINT_FIELD_U("{", *uc, pid);
+	PRINT_FIELD_UID(", ", *uc, uid);
+	PRINT_FIELD_UID(", ", *uc, gid);
+	tprints("}");
 }
 
 static void
@@ -184,10 +186,12 @@ print_cmsg_ip_recverr(struct tcb *tcp, const void *cmsg_data,
 {
 	const struct sock_ee *const err = cmsg_data;
 
-	tprintf("{ee_errno=%u, ee_origin=%u, ee_type=%u, ee_code=%u"
-		", ee_info=%u, ee_data=%u",
-		err->ee_errno, err->ee_origin, err->ee_type,
-		err->ee_code, err->ee_info, err->ee_data);
+	PRINT_FIELD_U("{", *err, ee_errno);
+	PRINT_FIELD_U(", ", *err, ee_origin);
+	PRINT_FIELD_U(", ", *err, ee_type);
+	PRINT_FIELD_U(", ", *err, ee_code);
+	PRINT_FIELD_U(", ", *err, ee_info);
+	PRINT_FIELD_U(", ", *err, ee_data);
 	PRINT_FIELD_SOCKADDR(", ", *err, offender);
 	tprints("}");
 }
@@ -375,17 +379,15 @@ print_struct_msghdr(struct tcb *tcp, const struct msghdr *msg,
 	tprintf("%d", msg->msg_namelen);
 
 	tprints(", msg_iov=");
-
 	tprint_iov_upto(tcp, msg->msg_iovlen,
 			ptr_to_kulong(msg->msg_iov), decode, data_size);
-	tprintf(", msg_iovlen=%" PRI_klu, (kernel_ulong_t) msg->msg_iovlen);
+	PRINT_FIELD_U(", ", *msg, msg_iovlen);
 
 	decode_msg_control(tcp, ptr_to_kulong(msg->msg_control),
 			   msg->msg_controllen);
-	tprintf(", msg_controllen=%" PRI_klu, (kernel_ulong_t) msg->msg_controllen);
+	PRINT_FIELD_U(", ", *msg, msg_controllen);
 
-	tprints(", msg_flags=");
-	printflags(msg_flags, msg->msg_flags, "MSG_???");
+	PRINT_FIELD_FLAGS(", ", *msg, msg_flags, msg_flags, "MSG_???");
 	tprints("}");
 }