expo: Drop the special theme code for bootflow_menu

The expo now has all that is needed to apply a suitable theme, so drop
this unnecessary code. Any further tweaks can be added to the generic
expo code.

Signed-off-by: Simon Glass <sjg@chromium.org>

boot/bootdev-uclass.c

@@ -972,6 +972,7 @@ err:
 	alist_uninit(&order);
 
 	return log_msg_ret("bso", -ENOMEM);
+
 }
 
 static int bootdev_pre_unbind(struct udevice *dev)

boot/bootflow_menu.c

@@ -294,7 +294,7 @@ int bootflow_menu_poll(struct expo *exp, int *seqp)
 	LOGR("bmp", expo_poll(exp, &act));
 
 	switch (act.type) {
-	case EXPOACT_SELECT:
+	case EXPOACT_SELECT: 
 		*seqp = act.select.id - ITEM;
 		break;
 	case EXPOACT_POINT_ITEM: {

boot/scene_menu.c

@@ -172,8 +172,9 @@ void scene_menu_calc_bbox(struct scene_obj_menu *menu,
 		scene_bbox_union(menu->obj.scene, item->desc_id,
 				 theme->menu_inset, &bbox[SCENEBB_desc]);
 
-		if (menu->cur_item_id == item->id)
+		if (menu->cur_item_id == item->id) {
 			scene_bbox_join(&local, 0, &bbox[SCENEBB_curitem]);
+		}
 	}
 
 	/*

drivers/video/console_truetype.c

@@ -824,7 +824,7 @@ static int truetype_measure(struct udevice *dev, const char *name, uint size,
 	/* add the final line */
 	mline.bbox.x0 = 0;
 	mline.bbox.y0 = bbox->y1;
-	mline.bbox.x1 = tt_ceil((double)width * met->scale);
+	mline.bbox.x1 = tt_ceil((double)width * met->scale);;
 	bbox->y1 += met->font_size;
 	mline.bbox.y1 = bbox->y1;
 	mline.start = start;

include/abuf.h

@@ -143,6 +143,7 @@ bool abuf_copy(const struct abuf *old, struct abuf *new);
 int abuf_printf(struct abuf *buf, const char *fmt, ...)
 		__attribute__ ((format (__printf__, 2, 3)));
 
+
 /**
  * abuf_uninit_move() - Return the allocated contents and uninit the abuf
  *

include/bootflow.h

@@ -657,7 +657,7 @@ struct bootflow_img *bootflow_img_add(struct bootflow *bflow, const char *fname,
 int bootflow_get_seq(const struct bootflow *bflow);
 
 /**
- * bootflow_menu_setup() - Set up a menu for bootflows
+ * bootflow_menu_setup() - Set up up a menu for bootflows
  *
  * Set up the expo, initially empty
  *

include/log.h

@@ -381,7 +381,7 @@ void __assert_fail(const char *assertion, const char *file, unsigned int line,
 #endif
 
 /*
- * LOGR() - helper macro for calling a function and logging error returns
+ * LOGR() - helper macro for calling a function and logging return
  *
  * Logs if the function returns a negative value
  *
@@ -394,7 +394,7 @@ void __assert_fail(const char *assertion, const char *file, unsigned int line,
 	} while (0)
 
 /*
- * LOGZ() - helper macro for calling a function and logging error returns
+ * LOGZ() - helper macro for calling a function and logging return
  *
  * Logs if the function returns a non-zero value
  *

include/video_console.h

@@ -590,7 +590,7 @@ int vidconsole_get_font_size(struct udevice *dev, const char **name, uint *sizep
  * vidconsole_set_quiet() - Select whether the console should output stdio
  *
  * @dev: vidconsole device
- * @quiet: true to suppress stdout/stderr output, false to enable it
+ * @quiet: true to supress stdout/stderr output, false to enable it
  */
 void vidconsole_set_quiet(struct udevice *dev, bool quiet);
 

test/boot/cedit.c

@@ -1,3 +1,4 @@
+
 // SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2023 Google LLC
@@ -123,6 +124,8 @@ static int cedit_fdt(struct unit_test_state *uts)
 	ut_assertnonnull(menu);
 	ut_assert_console_end();
 
+
+
 	return 0;
 }
 BOOTSTD_TEST(cedit_fdt, UTF_CONSOLE);

test/boot/expo.c

@@ -564,8 +564,7 @@ static int expo_render_image(struct unit_test_state *uts)
 	ut_assertok(scene_obj_set_bbox(scn, OBJ_TEXTED, 100, 200, 400, 650));
 	ut_assertok(expo_edit_str(exp, STR_TEXTED, &orig, &text));
 
-	abuf_printf(text, "This\nis the initial contents of the text editor "
-		"but it is quite likely that more will be added later");
+	abuf_printf(text, "This\nis the initial contents of the text editor but it is quite likely that more will be added later");
 
 	scn2 = expo_lookup_scene_id(exp, SCENE1);
 	ut_asserteq_ptr(scn, scn2);

test/dm/video.c

@@ -756,10 +756,7 @@ DM_TEST(dm_test_video_damage, UTF_SCAN_PDATA | UTF_SCAN_FDT);
 /* Test font measurement */
 static int dm_test_font_measure(struct unit_test_state *uts)
 {
-	const char *test_string = "There is always much\nto be said for not "
-		"attempting more than you can do and for making a certainty of "
-		"what you try. But this principle, like others in life and "
-		"war, has its exceptions.";
+	const char *test_string = "There is always much\nto be said for not attempting more than you can do and for making a certainty of what you try. But this principle, like others in life and war, has its exceptions.";
 	const struct vidconsole_mline *line;
 	struct vidconsole_bbox bbox;
 	struct video_priv *priv;
@@ -840,9 +837,7 @@ static int dm_test_font_measure(struct unit_test_state *uts)
 	ut_asserteq(nl + 1, line->start);
 	ut_asserteq(129, line->len);
 	printf("line1 '%.*s'\n", line->len, test_string + line->start);
-	ut_asserteq_strn("to be said for not attempting more than you can do "
-			 "and for making a certainty of what you try. But this "
-			 "principle, like others in",
+	ut_asserteq_strn("to be said for not attempting more than you can do and for making a certainty of what you try. But this principle, like others in",
 			 test_string + line->start);
 
 	line++;