[PATCH] libtraceevent: Fix for print_field

[PATCH] libtraceevent: Fix for print_field

[Ian Rogers]

Correct a typo in an operator which resolves a clang warning:

src/event-parse.c:5408:41: error: converting the enum constant to a boolean [-Werror,-Wint-in-bool-context]
        if (field->flags & (TEP_FIELD_IS_ARRAY || TEP_FIELD_IS_STRING))
                                               ^

Signed-off-by: Ian Rogers <irogers@google.com>
---
 src/event-parse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/event-parse.c b/src/event-parse.c
index 8057fb5..7063758 100644
--- a/src/event-parse.c
+++ b/src/event-parse.c
@@ -5405,7 +5405,7 @@ void static inline print_field(struct trace_seq *s, void *data,
 	if (!parse || event->flags & TEP_EVENT_FL_FAILED)
 		goto out;
 
-	if (field->flags & (TEP_FIELD_IS_ARRAY || TEP_FIELD_IS_STRING))
+	if (field->flags & (TEP_FIELD_IS_ARRAY | TEP_FIELD_IS_STRING))
 		goto out;
 
 	start_parse = parse;
-- 
2.33.0.464.g1972c5931b-goog

Re: [PATCH] libtraceevent: Fix for print_field

[Ian Rogers]

On Mon, Sep 20, 2021 at 11:37 AM Ian Rogers <irogers@google.com> wrote:
>
> Correct a typo in an operator which resolves a clang warning:
>
> src/event-parse.c:5408:41: error: converting the enum constant to a boolean [-Werror,-Wint-in-bool-context]
>         if (field->flags & (TEP_FIELD_IS_ARRAY || TEP_FIELD_IS_STRING))
>                                                ^
> Signed-off-by: Ian Rogers <irogers@google.com>

Ping. Thanks,
Ian

> ---
>  src/event-parse.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/event-parse.c b/src/event-parse.c
> index 8057fb5..7063758 100644
> --- a/src/event-parse.c
> +++ b/src/event-parse.c
> @@ -5405,7 +5405,7 @@ void static inline print_field(struct trace_seq *s, void *data,
>         if (!parse || event->flags & TEP_EVENT_FL_FAILED)
>                 goto out;
>
> -       if (field->flags & (TEP_FIELD_IS_ARRAY || TEP_FIELD_IS_STRING))
> +       if (field->flags & (TEP_FIELD_IS_ARRAY | TEP_FIELD_IS_STRING))
>                 goto out;
>
>         start_parse = parse;
> --
> 2.33.0.464.g1972c5931b-goog
>

Re: [PATCH] libtraceevent: Fix for print_field

[Steven Rostedt]

On Mon, 27 Sep 2021 14:17:58 -0700
Ian Rogers <irogers@google.com> wrote:

> Ping. Thanks,
> Ian

Hi Ian,

I'm currently traveling, but when I get back, I'll be going through the queue.

Your patch is in the queue, and you can check the status here:

   https://patchwork.kernel.org/project/linux-trace-devel/patch/20210920183715.33377-1-irogers@google.com/

Thanks!

-- Steve

Re: [PATCH] libtraceevent: Fix for print_field

[Steven Rostedt]

On Mon, 20 Sep 2021 11:37:15 -0700
Ian Rogers <irogers@google.com> wrote:

> Correct a typo in an operator which resolves a clang warning:
> 
> src/event-parse.c:5408:41: error: converting the enum constant to a boolean [-Werror,-Wint-in-bool-context]
>         if (field->flags & (TEP_FIELD_IS_ARRAY || TEP_FIELD_IS_STRING))
>                                                ^
> 
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
>  src/event-parse.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/event-parse.c b/src/event-parse.c
> index 8057fb5..7063758 100644
> --- a/src/event-parse.c
> +++ b/src/event-parse.c
> @@ -5405,7 +5405,7 @@ void static inline print_field(struct trace_seq *s, void *data,
>  	if (!parse || event->flags & TEP_EVENT_FL_FAILED)
>  		goto out;
>  
> -	if (field->flags & (TEP_FIELD_IS_ARRAY || TEP_FIELD_IS_STRING))
> +	if (field->flags & (TEP_FIELD_IS_ARRAY | TEP_FIELD_IS_STRING))

Bah, I should have caught this in my review.

Another example of the usefulness of clang errors.

Applied, thanks Ian!

-- Steve

>  		goto out;
>  
>  	start_parse = parse;