jcs.org / u-boot
"Das U-Boot" Source Tree
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

expo: Drop scene_title_set()

This function is really just an assignment, so serves no useful
purpose. Drop it.

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

Simon Glass 96cbafb1 fde70750

+3 -19
+2 -2
boot/expo_build.c
··· 404 404 if (ret < 0) 405 405 return log_msg_ret("tit", ret); 406 406 title_id = ret; 407 - scene_title_set(scn, title_id); 407 + scn->title_id = title_id; 408 408 409 409 ret = add_txt_str(info, scn_node, scn, "prompt", 0); 410 410 if (ret < 0) ··· 420 420 return 0; 421 421 } 422 422 423 - int build_it(struct build_info *info, ofnode root, struct expo **expp) 423 + static int build_it(struct build_info *info, ofnode root, struct expo **expp) 424 424 { 425 425 ofnode scenes, node; 426 426 struct expo *exp;
-7
boot/scene.c
··· 70 70 free(scn); 71 71 } 72 72 73 - int scene_title_set(struct scene *scn, uint id) 74 - { 75 - scn->title_id = id; 76 - 77 - return 0; 78 - } 79 - 80 73 int scene_obj_count(struct scene *scn) 81 74 { 82 75 return list_count_nodes(&scn->obj_head);
-9
include/expo.h
··· 541 541 int scene_set_open(struct scene *scn, uint id, bool open); 542 542 543 543 /** 544 - * scene_title_set() - set the scene title 545 - * 546 - * @scn: Scene to update 547 - * @title_id: Title ID to set 548 - * Returns: 0 if OK 549 - */ 550 - int scene_title_set(struct scene *scn, uint title_id); 551 - 552 - /** 553 544 * scene_obj_count() - Count the number of objects in a scene 554 545 * 555 546 * @scn: Scene to check
+1 -1
test/boot/expo.c
··· 151 151 scn = NULL; 152 152 id = scene_new(exp, SCENE_NAME2, 0, &scn); 153 153 ut_assertnonnull(scn); 154 - ut_assertok(scene_title_set(scn, title_id)); 154 + scn->title_id = title_id; 155 155 ut_asserteq(STR_SCENE_TITLE + 1, id); 156 156 ut_asserteq(STR_SCENE_TITLE + 2, exp->next_id); 157 157 ut_asserteq_ptr(exp, scn->expo);