[PATCH] test: fix misplaced braces in strncmp call

[PATCH] test: fix misplaced braces in strncmp call

[Bruce Richardson]

This patch fixes two occurances where a call to strncmp had the closing
brace in the wrong place. Changing this form:
	if (strncmp(X,Y,sizeof(X) != 0))
which does a comparison of length 1, to
	if (strncmp(X,Y,sizeof(X)) != 0)
which does the correct length comparison and then compares the result to
zero in the "if" part, as the author presumably originally intended.

Reported-by: Larry Wang <liang-min.wang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Signed-off-by: Bruce Richardson <bruce.richardson-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
 app/test/test_devargs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/test/test_devargs.c b/app/test/test_devargs.c
index f0acf8e..dcbdd09 100644
--- a/app/test/test_devargs.c
+++ b/app/test/test_devargs.c
@@ -90,9 +90,9 @@ test_devargs(void)
 		goto fail;
 	devargs = TAILQ_FIRST(&devargs_list);
 	if (strncmp(devargs->virtual.drv_name, "eth_ring1",
-			sizeof(devargs->virtual.drv_name) != 0))
+			sizeof(devargs->virtual.drv_name)) != 0)
 		goto fail;
-	if (strncmp(devargs->args, "k1=val,k2=val2", sizeof(devargs->args) != 0))
+	if (strncmp(devargs->args, "k1=val,k2=val2", sizeof(devargs->args)) != 0)
 		goto fail;
 	free_devargs_list();
 
-- 
1.9.3

Re: [PATCH] test: fix misplaced braces in strncmp call

[Olivier MATZ]

Hi Bruce,

On 11/19/2014 10:06 AM, Bruce Richardson wrote:
> This patch fixes two occurances where a call to strncmp had the closing
> brace in the wrong place. Changing this form:
> 	if (strncmp(X,Y,sizeof(X) != 0))
> which does a comparison of length 1, to
> 	if (strncmp(X,Y,sizeof(X)) != 0)
> which does the correct length comparison and then compares the result to
> zero in the "if" part, as the author presumably originally intended.
>
> Reported-by: Larry Wang <liang-min.wang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> Signed-off-by: Bruce Richardson <bruce.richardson-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> ---
>   app/test/test_devargs.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/app/test/test_devargs.c b/app/test/test_devargs.c
> index f0acf8e..dcbdd09 100644
> --- a/app/test/test_devargs.c
> +++ b/app/test/test_devargs.c
> @@ -90,9 +90,9 @@ test_devargs(void)
>   		goto fail;
>   	devargs = TAILQ_FIRST(&devargs_list);
>   	if (strncmp(devargs->virtual.drv_name, "eth_ring1",
> -			sizeof(devargs->virtual.drv_name) != 0))
> +			sizeof(devargs->virtual.drv_name)) != 0)
>   		goto fail;
> -	if (strncmp(devargs->args, "k1=val,k2=val2", sizeof(devargs->args) != 0))
> +	if (strncmp(devargs->args, "k1=val,k2=val2", sizeof(devargs->args)) != 0)
>   		goto fail;
>   	free_devargs_list();
>
>

Nice catch!

Acked-by: Olivier Matz <olivier.matz-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>

Re: [PATCH] test: fix misplaced braces in strncmp call

[Thomas Monjalon]

> > This patch fixes two occurances where a call to strncmp had the closing
> > brace in the wrong place. Changing this form:
> > 	if (strncmp(X,Y,sizeof(X) != 0))
> > which does a comparison of length 1, to
> > 	if (strncmp(X,Y,sizeof(X)) != 0)
> > which does the correct length comparison and then compares the result to
> > zero in the "if" part, as the author presumably originally intended.
> >
> > Reported-by: Larry Wang <liang-min.wang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> > Signed-off-by: Bruce Richardson <bruce.richardson-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> 
> Nice catch!
> 
> Acked-by: Olivier Matz <olivier.matz-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
 
Applied

Thanks
-- 
Thomas