From 1e5866a25840fda879e87886795df5be9179fb0f Mon Sep 17 00:00:00 2001 From: Eugene Syromyatnikov Date: Mon, 22 Aug 2022 18:05:33 +0200 Subject: src: use tprint[fs]_pre_comment helpers * src/s390.c (print_sthyi_machine, print_sthyi_partition, print_sthyi_buf): Use tprints_pre_comment. (print_sthyi_hypervisor, print_sthyi_guest): Use tprintf_pre_comment. * src/util.c (print_nonzero_bytes): Use tprintf_pre_comment. --- src/s390.c | 10 +++++----- src/util.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/s390.c b/src/s390.c index 5f024142b..2409437e7 100644 --- a/src/s390.c +++ b/src/s390.c @@ -510,7 +510,7 @@ print_sthyi_machine(struct tcb *tcp, struct sthyi_machine *hdr, uint16_t size, CHECK_SIZE_EX(hdr, last_decoded, size, "machine structure"); - tprints("/* machine */ "); + tprints_pre_comment("machine"); tprint_struct_begin(); if (!abbrev(tcp)) { if (hdr->infmflg1) { /* Reserved */ @@ -621,7 +621,7 @@ print_sthyi_partition(struct tcb *tcp, struct sthyi_partition *hdr, *mt = !!(hdr->infpflg1 & 0x80); - tprints("/* partition */ "); + tprints_pre_comment("partition"); tprint_struct_begin(); PRINT_FIELD_0X(*hdr, infpflg1); if (!abbrev(tcp) && hdr->infpflg1) @@ -807,7 +807,7 @@ print_sthyi_hypervisor(struct tcb *tcp, struct sthyi_hypervisor *hdr, CHECK_SIZE_EX(hdr, last_decoded, size, "hypervisor %d structure", num); - tprintf("/* hypervisor %d */ ", num); + tprintf_pre_comment("hypervisor %d", num); tprint_struct_begin(); PRINT_FIELD_0X(*hdr, infyflg1); if (!abbrev(tcp) && hdr->infyflg1) @@ -923,7 +923,7 @@ print_sthyi_guest(struct tcb *tcp, struct sthyi_guest *hdr, uint16_t size, { CHECK_SIZE(hdr, size, "guest %d structure", num); - tprintf("/* guest %d */ ", num); + tprintf_pre_comment("guest %d", num); tprint_struct_begin(); PRINT_FIELD_0X(*hdr, infgflg1); if (!abbrev(tcp) && hdr->infgflg1) @@ -1133,7 +1133,7 @@ print_sthyi_buf(struct tcb *tcp, kernel_ulong_t ptr) tprint_struct_begin(); /* Header */ - tprints("/* header */ "); + tprints_pre_comment("header"); tprint_struct_begin(); PRINT_FIELD_0X(*hdr, infhflg1); diff --git a/src/util.c b/src/util.c index c4c4bc0ef..d9a661bdf 100644 --- a/src/util.c +++ b/src/util.c @@ -1255,7 +1255,7 @@ print_nonzero_bytes(struct tcb *const tcp, ret = false; } else { prefix_fun(); - tprintf("/* bytes %u..%u */ ", start_offs, total_len - 1); + tprintf_pre_comment("bytes %u..%u", start_offs, total_len - 1); print_quoted_string(str, size, style); -- cgit v1.2.1