diff mbox series

[Concept,22/30] fit: Use emit_label_val() where possible

Message ID	20251120025614.2215587-23-sjg@u-boot.org
State	New
Headers	From: Simon Glass <sjg@u-boot.org> To: U-Boot Concept <concept@u-boot.org> Date: Wed, 19 Nov 2025 19:55:57 -0700 Message-ID: <20251120025614.2215587-23-sjg@u-boot.org> In-Reply-To: <20251120025614.2215587-1-sjg@u-boot.org> References: <20251120025614.2215587-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: WI2OXR6OYQCYUM2RCJYFDYP3MEWJFOZU CC: Heinrich Schuchardt <xypron.glpk@gmx.de>, Simon Glass <simon.glass@canonical.com>, Claude <noreply@anthropic.com> Precedence: list Subject: [Concept] [PATCH 22/30] fit: Use emit_label_val() where possible Archived-At: <https://lists.u-boot.org/archives/list/concept@u-boot.org/message/WI2OXR6OYQCYUM2RCJYFDYP3MEWJFOZU/> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit
Series	fit: Improve and test the code to print FIT info \| [Concept,00/30] fit: Improve and test the code to print FIT info [Concept,01/30] docs: Merge .claude/README.md into CLAUDE.md [Concept,02/30] tools: Fix debug() to avoid unused-variable warnings [Concept,03/30] test: Increase expect_str/actual_str buffer size [Concept,04/30] fit: Remove unused len parameter from fit_get_name() [Concept,05/30] test: Add a test for FIT image printing [Concept,06/30] test: Add signature-testing to the FIT-printing test [Concept,07/30] test: fit: Test printing a FIT with multiple FDTs [Concept,08/30] test: fit: Test the remaining features and edge cases [Concept,09/30] test: fit: Add test for missing FIT description [Concept,10/30] test: fit: Add pytest for mkimage output [Concept,11/30] fit: Refactor fit_print_contents() to use new fit_print() [Concept,12/30] fit: Move printing code to its own file [Concept,13/30] fit: Drop showing an unused 'required' property [Concept,14/30] fit: Add a context struct for FIT-printing [Concept,15/30] fit: Put the indent string into print context [Concept,16/30] fit: Create some helpers for printing [Concept,17/30] fit: Use emit_label() helper in fit_image_print() [Concept,18/30] fit: Use emit_label() helper in fit_conf_print() [Concept,19/30] fit: Add a a function to print labels with values [Concept,20/30] fit: Change indent from string to int [Concept,21/30] fit: Move values one column to the right [Concept,22/30] fit: Use emit_label_val() where possible [Concept,23/30] fit: Add a helper to output optional properties [Concept,24/30] fit: Add a helper for timestamp printing [Concept,25/30] fit: Add a helper for stringlist properties [Concept,26/30] fit: Add a helper for printing descriptions [Concept,27/30] fit: Add a helper for address printing [Concept,28/30] fit: Use a boolean to simplify type checks [Concept,29/30] fit: Add a helper to iterate through hash/signature nodes [Concept,30/30] fit: Use the libfdt subnode iterator

Commit Message

Simon Glass Nov. 20, 2025, 2:55 a.m. UTC

  From: Simon Glass <simon.glass@canonical.com>

Refactor the printing of multi-line properties to use the
emit_label_val() helper function instead of custom formatting.

Update emit_label() to deal with an empty label and not show a colon in
that case.

Co-developed-by: Claude <noreply@anthropic.com>
Signed-off-by: Simon Glass <simon.glass@canonical.com>
---

 boot/fit_print.c | 36 ++++++++----------------------------
 1 file changed, 8 insertions(+), 28 deletions(-)

diff mbox series

Patch

diff --git a/boot/fit_print.c b/boot/fit_print.c
index e26f2294229..628d6108bea 100644
--- a/boot/fit_print.c
+++ b/boot/fit_print.c
@@ -69,7 +69,7 @@  static void emit_label(struct fit_print_ctx *ctx, const char *label)
 {
 	int len;
 
-	len = printf("%*s%s:", ctx->indent, "", label);
+	len = printf("%*s%s%c", ctx->indent, "", label, *label ? ':' : ' ');
 	printf("%*s", ctx->tab - len, "");
 }
 
@@ -315,7 +315,6 @@  void fit_image_print(struct fit_print_ctx *ctx, int image_noffset)
 static void fit_conf_print(struct fit_print_ctx *ctx, int noffset)
 {
 	const void *fit = ctx->fit;
-	int p = ctx->indent;
 	const char *uname, *desc;
 	int ret, ndepth, i;
 
@@ -338,13 +337,8 @@  static void fit_conf_print(struct fit_print_ctx *ctx, int noffset)
 	for (i = 0;
 	     uname = fdt_stringlist_get(fit, noffset, FIT_FDT_PROP,
 					i, NULL), uname;
-	     i++) {
-		if (!i)
-			emit_label(ctx, "FDT");
-		else
-			printf("%*s               ", p, "");
-		printf("%s\n", uname);
-	}
+	     i++)
+		emit_label_val(ctx, i ? "" : "FDT", uname);
 
 	uname = fdt_getprop(fit, noffset, FIT_FPGA_PROP, NULL);
 	if (uname)
@@ -354,23 +348,13 @@  static void fit_conf_print(struct fit_print_ctx *ctx, int noffset)
 	for (i = 0;
 	     uname = fdt_stringlist_get(fit, noffset, FIT_LOADABLE_PROP,
 					i, NULL), uname;
-	     i++) {
-		if (!i)
-			emit_label(ctx, "Loadables");
-		else
-			printf("%*s               ", p, "");
-		printf("%s\n", uname);
-	}
+	     i++)
+		emit_label_val(ctx, i ? "" : "Loadables", uname);
 
 	/* Show the list of compatible strings */
 	for (i = 0; uname = fdt_stringlist_get(fit, noffset,
-				FIT_COMPATIBLE_PROP, i, NULL), uname; i++) {
-		if (!i)
-			emit_label(ctx, "Compatible");
-		else
-			printf("%*s               ", p, "");
-		printf("%s\n", uname);
-	}
+				FIT_COMPATIBLE_PROP, i, NULL), uname; i++)
+		emit_label_val(ctx, i ? "" : "Compatible", uname);
 
 	/* Process all hash subnodes of the component configuration node */
 	for (ndepth = 0, noffset = fdt_next_node(fit, noffset, &ndepth);
@@ -399,11 +383,7 @@  void fit_print(struct fit_print_ctx *ctx)
 
 	/* Root node properties */
 	ret = fit_get_desc(fit, 0, &desc);
-	printf("%*sFIT description: ", p, "");
-	if (ret)
-		printf("unavailable\n");
-	else
-		printf("%s\n", desc);
+	emit_label_val(ctx, "FIT description", ret ? "unavailable" : desc);
 
 	if (IMAGE_ENABLE_TIMESTAMP) {
 		ret = fit_get_timestamp(fit, 0, &timestamp);