[PATCH] perf tools: Simplify the calculation of variables

[PATCH] perf tools: Simplify the calculation of variables

[Jiapeng Chong]

Fix the following coccicheck warnings:

./tools/perf/util/header.c:3809:18-20: WARNING !A || A && B is
equivalent to !A || B.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
 tools/perf/util/header.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index c4ed3dc..4fe9e2a 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -3806,7 +3806,7 @@ int perf_session__read_header(struct perf_session *session)
 	 * check for the pipe header regardless of source.
 	 */
 	err = perf_header__read_pipe(session);
-	if (!err || (err && perf_data__is_pipe(data))) {
+	if (!err || perf_data__is_pipe(data)) {
 		data->is_pipe = true;
 		return err;
 	}
-- 
1.8.3.1

Re: [PATCH] perf tools: Simplify the calculation of variables

[Jiri Olsa]

On Fri, Feb 05, 2021 at 11:54:15AM +0800, Jiapeng Chong wrote:
> Fix the following coccicheck warnings:
> 
> ./tools/perf/util/header.c:3809:18-20: WARNING !A || A && B is
> equivalent to !A || B.
> 
> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
> ---
>  tools/perf/util/header.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
> index c4ed3dc..4fe9e2a 100644
> --- a/tools/perf/util/header.c
> +++ b/tools/perf/util/header.c
> @@ -3806,7 +3806,7 @@ int perf_session__read_header(struct perf_session *session)
>  	 * check for the pipe header regardless of source.
>  	 */
>  	err = perf_header__read_pipe(session);
> -	if (!err || (err && perf_data__is_pipe(data))) {
> +	if (!err || perf_data__is_pipe(data)) {

mama mia, thanks

Acked-by: Jiri Olsa <jolsa@redhat.com>

jirka

>  		data->is_pipe = true;
>  		return err;
>  	}
> -- 
> 1.8.3.1
> 

Re: [PATCH] perf tools: Simplify the calculation of variables

[Arnaldo Carvalho de Melo]

Em Fri, Feb 05, 2021 at 10:49:15AM +0100, Jiri Olsa escreveu:
> On Fri, Feb 05, 2021 at 11:54:15AM +0800, Jiapeng Chong wrote:
> > Fix the following coccicheck warnings:
> > 
> > ./tools/perf/util/header.c:3809:18-20: WARNING !A || A && B is
> > equivalent to !A || B.
> > 
> > Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> > Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
> > ---
> >  tools/perf/util/header.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
> > index c4ed3dc..4fe9e2a 100644
> > --- a/tools/perf/util/header.c
> > +++ b/tools/perf/util/header.c
> > @@ -3806,7 +3806,7 @@ int perf_session__read_header(struct perf_session *session)
> >  	 * check for the pipe header regardless of source.
> >  	 */
> >  	err = perf_header__read_pipe(session);
> > -	if (!err || (err && perf_data__is_pipe(data))) {
> > +	if (!err || perf_data__is_pipe(data)) {
> 
> mama mia, thanks
> 
> Acked-by: Jiri Olsa <jolsa@redhat.com>

Thanks, applied.

- Arnaldo

 
> jirka
> 
> >  		data->is_pipe = true;
> >  		return err;
> >  	}
> > -- 
> > 1.8.3.1
> > 
> 

-- 

- Arnaldo