post: fix indendation/brace confusion
PATCH 1/1 post: fix indendation/brace confusion
From: James Kosin <[email protected]>
The post.c code is missing braces around the pass case, and as a result, the diagnostic function will post both fail and pass for a failed test. The reason for this bug is probably the incorrect indentation used, so when reading the code it seems like there are proper braces.
Indent the code to the correct depth and put proper braces around the "else" branch of the "if" statement.
--- post/post.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
post/post.c +12 -12
@@ -293,18 +293,18 @@ static int post_run_single (struct post_test *test, gd->flags |=GD_FLG_POSTSTOP ; } }else { -if ((*test->test) (flags) !=0 ) { -post_log ("FAILED\n" ); -show_boot_progress (-32 ); -show_post_progress (i,POST_AFTER ,POST_FAILED ); -if (test_flags &POST_CRITICAL ) - gd->flags |=GD_FLG_POSTFAIL ; -if (test_flags &POST_STOP ) - gd->flags |=GD_FLG_POSTSTOP ; - } -else -post_log ("PASSED\n" ); -show_post_progress (i,POST_AFTER ,POST_PASSED ); +if ((*test->test)(flags) !=0 ) { +post_log ("FAILED\n" ); +show_boot_progress (-32 ); +show_post_progress (i,POST_AFTER ,POST_FAILED ); +if (test_flags &POST_CRITICAL ) + gd->flags |=GD_FLG_POSTFAIL ; +if (test_flags &POST_STOP ) + gd->flags |=GD_FLG_POSTSTOP ; + }else { +post_log ("PASSED\n" ); +show_post_progress (i,POST_AFTER ,POST_PASSED ); + } }if ((test_flags &POST_REBOOT ) && !(flags &POST_MANUAL )) {
Signature · 1 line
1.7.6
PATCH 1/1 post: fix indendation/brace confusion
Thanks Mike for this...
I was making changes and wasn't sure why I added a call to remember the post results for event the manual tests; so, I could do a report for production purposes ... anyway my code was always marking the tests as passed even if they failed which is how I caught this.
James Kosin
Quoted 52 lines · Mike Frysinger
From: James Kosin <[email protected]>
The
post.ccode is missing braces around the pass case, and as a result, the diagnostic function will post both fail and pass for a failed test. The reason for this bug is probably the incorrect indentation used, so when reading the code it seems like there are proper braces.Indent the code to the correct depth and put proper braces around the "else" branch of the "if" statement.
Signed-off-by James Kosin <[email protected]>Signed-off-by Mike Frysinger <[email protected]>--- post/post.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)post/post.c +12
-12@@ -293,18 +293,18 @@ static int post_run_single (struct post_test *test, gd->flags |=GD_FLG_POSTSTOP ; } }else { -if ((*test->test) (flags) !=0 ) { -post_log ("FAILED\n" ); -show_boot_progress (-32 ); -show_post_progress (i,POST_AFTER ,POST_FAILED ); -if (test_flags &POST_CRITICAL ) - gd->flags |=GD_FLG_POSTFAIL ; -if (test_flags &POST_STOP ) - gd->flags |=GD_FLG_POSTSTOP ; - } -else -post_log ("PASSED\n" ); -show_post_progress (i,POST_AFTER ,POST_PASSED ); +if ((*test->test)(flags) !=0 ) { +post_log ("FAILED\n" ); +show_boot_progress (-32 ); +show_post_progress (i,POST_AFTER ,POST_FAILED ); +if (test_flags &POST_CRITICAL ) + gd->flags |=GD_FLG_POSTFAIL ; +if (test_flags &POST_STOP ) + gd->flags |=GD_FLG_POSTSTOP ; + }else { +post_log ("PASSED\n" ); +show_post_progress (i,POST_AFTER ,POST_PASSED ); + } }if ((test_flags &POST_REBOOT ) && !(flags &POST_MANUAL )) {
Wolfgang Denk
AppliedPATCH 1/1 post: fix indendation/brace confusion
In reply to Mike FrysingerDear Mike Frysinger,
Quoted 8 lines · In message <[email protected]> you wrote:
From: James Kosin <[email protected]>
The
post.ccode is missing braces around the pass case, and as a result, the diagnostic function will post both fail and pass for a failed test. The reason for this bug is probably the incorrect indentation used, so when reading the code it seems like there are proper braces.
Quoted 8 lines
Indent the code to the correct depth and put proper braces around the "else" branch of the "if" statement.
Signed-off-by James Kosin <[email protected]>Signed-off-by Mike Frysinger <[email protected]>--- post/post.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de The speed of time is one second per second.