On Wed, Nov 21, 2018 at 03:53:57PM -0600, Rob Herring wrote:
> The entire check_msg function is under the if condition except for
> va_start/va_end. Move these and invert the if condition saving a level
> of indentation.
>
> Signed-off-by: Rob Herring <robh@xxxxxxxxxx>
> ---
> checks.c | 28 ++++++++++++++--------------
> 1 file changed, 14 insertions(+), 14 deletions(-)
Applied, thanks.
>
> diff --git a/checks.c b/checks.c
> index ed84e03e6d2f..4d8dffd36b6e 100644
> --- a/checks.c
> +++ b/checks.c
> @@ -78,23 +78,23 @@ static inline void PRINTF(5, 6) check_msg(struct check *c, struct dt_info *dti,
> const char *fmt, ...)
> {
> va_list ap;
> - va_start(ap, fmt);
>
> - if ((c->warn && (quiet < 1))
> - || (c->error && (quiet < 2))) {
> - fprintf(stderr, "%s: %s (%s): ",
> - strcmp(dti->outname, "-") ? dti->outname : "<stdout>",
> - (c->error) ? "ERROR" : "Warning", c->name);
> - if (node) {
> - fprintf(stderr, "%s", node->fullpath);
> - if (prop)
> - fprintf(stderr, ":%s", prop->name);
> - fputs(": ", stderr);
> - }
> - vfprintf(stderr, fmt, ap);
> - fprintf(stderr, "\n");
> + if (!(c->warn && (quiet < 1)) && !(c->error && (quiet < 2)))
> + return;
> +
> + fprintf(stderr, "%s: %s (%s): ",
> + strcmp(dti->outname, "-") ? dti->outname : "<stdout>",
> + (c->error) ? "ERROR" : "Warning", c->name);
> + if (node) {
> + fprintf(stderr, "%s", node->fullpath);
> + if (prop)
> + fprintf(stderr, ":%s", prop->name);
> + fputs(": ", stderr);
> }
> + va_start(ap, fmt);
> + vfprintf(stderr, fmt, ap);
> va_end(ap);
> + fprintf(stderr, "\n");
> }
>
> #define FAIL(c, dti, node, ...) \
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
Attachment:
signature.asc
Description: PGP signature
