All of lore.kernel.org
 help / color / mirror / Atom feed
From: James Kosin <jkosin@intcomgrp.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] post: fix indendation/brace confusion
Date: Thu, 14 Jul 2011 15:39:05 -0400	[thread overview]
Message-ID: <4E1F45D9.1060702@intcomgrp.com> (raw)
In-Reply-To: <1310667306-24948-1-git-send-email-vapier@gentoo.org>

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

On 7/14/2011 2:15 PM, Mike Frysinger wrote:
> From: James Kosin <jkosin@intcomgrp.com>
>
> 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.
>
> Signed-off-by: James Kosin <jkosin@intcomgrp.com>
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
>  post/post.c |   24 ++++++++++++------------
>  1 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/post/post.c b/post/post.c
> index 7660224..852d6a5 100644
> --- a/post/post.c
> +++ b/post/post.c
> @@ -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)) {

  reply	other threads:[~2011-07-14 19:39 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-14 18:15 [U-Boot] [PATCH] post: fix indendation/brace confusion Mike Frysinger
2011-07-14 19:39 ` James Kosin [this message]
2011-07-26 14:57 ` Wolfgang Denk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4E1F45D9.1060702@intcomgrp.com \
    --to=jkosin@intcomgrp.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.