From 66cd3537f9c27818993de4cd9360283cbdb8293c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 10 Oct 2023 16:05:28 +0200 Subject: [PATCH] dissect: don't show non-JSON arch + sector size in JSON mode --- src/dissect/dissect.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c index 0b4c5ba22fe..c84325620bb 100644 --- a/src/dissect/dissect.c +++ b/src/dissect/dissect.c @@ -836,15 +836,15 @@ static int action_dissect(DissectedImage *m, LoopDevice *d) { else if (arg_json_format_flags & JSON_FORMAT_OFF) printf(" Size: %s\n", FORMAT_BYTES(size)); - printf(" Sec. Size: %" PRIu32 "\n", m->sector_size); + if (arg_json_format_flags & JSON_FORMAT_OFF) { + printf(" Sec. Size: %" PRIu32 "\n", m->sector_size); - printf(" Arch.: %s\n", - strna(architecture_to_string(dissected_image_architecture(m)))); + printf(" Arch.: %s\n", + strna(architecture_to_string(dissected_image_architecture(m)))); - if (arg_json_format_flags & JSON_FORMAT_OFF) putc('\n', stdout); - - fflush(stdout); + fflush(stdout); + } r = dissected_image_acquire_metadata(m, 0); if (r == -ENXIO) -- 2.47.3