From: Dmitry V. Levin <ldv@altlinux.org>
Date: Tue, 11 Jul 2017 00:20:54 +0000 (+0000)
Subject: Rename PRINT_FIELD_QUOTED_STRING to PRINT_FIELD_STRING
X-Git-Tag: v4.19~281
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d3bd017a5449f112360f2d8b61997524283b069;p=strace

Rename PRINT_FIELD_QUOTED_STRING to PRINT_FIELD_STRING

As string fields are always qouted when printed, choose a shorter name
for the helper macro.

* print_fields.h (PRINT_FIELD_QUOTED_STRING): Rename
to PRINT_FIELD_STRING.  All callers updated.
---

diff --git a/netlink_sock_diag.c b/netlink_sock_diag.c
index 1bb832e7..43c595df 100644
--- a/netlink_sock_diag.c
+++ b/netlink_sock_diag.c
@@ -487,7 +487,7 @@ print_packet_diag_mclist(struct tcb *const tcp, void *const elem_buf,
 	PRINT_FIELD_U(", ", *dml, pdmc_count);
 	PRINT_FIELD_U(", ", *dml, pdmc_type);
 	PRINT_FIELD_U(", ", *dml, pdmc_alen);
-	PRINT_FIELD_QUOTED_STRING(", ", *dml, pdmc_addr, alen, QUOTE_FORCE_HEX);
+	PRINT_FIELD_STRING(", ", *dml, pdmc_addr, alen, QUOTE_FORCE_HEX);
 	tprints("}");
 
 	return true;
@@ -964,16 +964,16 @@ decode_smc_diag_lgrinfo(struct tcb *const tcp,
 
 	tprints("{lnk[0]={");
 	PRINT_FIELD_U("", linfo.lnk[0], link_id);
-	PRINT_FIELD_QUOTED_STRING(", ", linfo.lnk[0], ibname,
-				  sizeof(linfo.lnk[0].ibname),
-				  QUOTE_0_TERMINATED);
+	PRINT_FIELD_STRING(", ", linfo.lnk[0], ibname,
+			   sizeof(linfo.lnk[0].ibname),
+			   QUOTE_0_TERMINATED);
 	PRINT_FIELD_U(", ", linfo.lnk[0], ibport);
-	PRINT_FIELD_QUOTED_STRING(", ", linfo.lnk[0], gid,
-				  sizeof(linfo.lnk[0].gid),
-				  QUOTE_0_TERMINATED);
-	PRINT_FIELD_QUOTED_STRING(", ", linfo.lnk[0], peer_gid,
-				  sizeof(linfo.lnk[0].peer_gid),
-				  QUOTE_0_TERMINATED);
+	PRINT_FIELD_STRING(", ", linfo.lnk[0], gid,
+			   sizeof(linfo.lnk[0].gid),
+			   QUOTE_0_TERMINATED);
+	PRINT_FIELD_STRING(", ", linfo.lnk[0], peer_gid,
+			   sizeof(linfo.lnk[0].peer_gid),
+			   QUOTE_0_TERMINATED);
 	PRINT_FIELD_XVAL("}, ", linfo, role, smc_link_group_roles, "SMC_???");
 	tprints("}");
 
diff --git a/print_fields.h b/print_fields.h
index 49e5def0..4d486d35 100644
--- a/print_fields.h
+++ b/print_fields.h
@@ -79,7 +79,7 @@
 				      zero_extend_signed_to_ull((where_).field_));	\
 	} while (0)
 
-#define PRINT_FIELD_QUOTED_STRING(prefix_, where_, field_, len_, style_)		\
+#define PRINT_FIELD_STRING(prefix_, where_, field_, len_, style_)			\
 	do {										\
 		STRACE_PRINTF("%s%s=", (prefix_), #field_);				\
 		print_quoted_string((const char *)(where_).field_, len_, style_);	\