[PATCH] autopair: Fix compiler warning

[PATCH] autopair: Fix compiler warning

[Sonny Sasaka]

With clang, comparing an array with NULL generates a warning because the
value is always non-NULL. With maintainer mode enabled, this becomes a
compilation error.
---
 plugins/autopair.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/autopair.c b/plugins/autopair.c
index 043bd9b9d..3089430a8 100644
--- a/plugins/autopair.c
+++ b/plugins/autopair.c
@@ -75,7 +75,7 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter,
         btd_device_get_product (device));

     /* The iCade shouldn't use random PINs like normal keyboards */
-    if (name != NULL && strstr(name, "iCade") != NULL)
+    if (strstr(name, "iCade") != NULL)
         return 0;

     /* This is a class-based pincode guesser. Ignore devices with an
-- 
2.17.1

Re: [PATCH] autopair: Fix compiler warning

[Sonny Sasaka]

Hi BlueZ maintainers,

Could you take a look at this fix? Thank you!

On Tue, Mar 24, 2020 at 12:49 PM Sonny Sasaka <sonnysasaka@chromium.org> wrote:
>
> With clang, comparing an array with NULL generates a warning because the
> value is always non-NULL. With maintainer mode enabled, this becomes a
> compilation error.
> ---
>  plugins/autopair.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/plugins/autopair.c b/plugins/autopair.c
> index 043bd9b9d..3089430a8 100644
> --- a/plugins/autopair.c
> +++ b/plugins/autopair.c
> @@ -75,7 +75,7 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter,
>          btd_device_get_product (device));
>
>      /* The iCade shouldn't use random PINs like normal keyboards */
> -    if (name != NULL && strstr(name, "iCade") != NULL)
> +    if (strstr(name, "iCade") != NULL)
>          return 0;
>
>      /* This is a class-based pincode guesser. Ignore devices with an
> --
> 2.17.1

Re: [PATCH] autopair: Fix compiler warning

[Luiz Augusto von Dentz]

Hi Sonny,

On Thu, Mar 26, 2020 at 10:23 AM Sonny Sasaka <sonnysasaka@chromium.org> wrote:
>
> Hi BlueZ maintainers,
>
> Could you take a look at this fix? Thank you!
>
> On Tue, Mar 24, 2020 at 12:49 PM Sonny Sasaka <sonnysasaka@chromium.org> wrote:
> >
> > With clang, comparing an array with NULL generates a warning because the
> > value is always non-NULL. With maintainer mode enabled, this becomes a
> > compilation error.
> > ---
> >  plugins/autopair.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/plugins/autopair.c b/plugins/autopair.c
> > index 043bd9b9d..3089430a8 100644
> > --- a/plugins/autopair.c
> > +++ b/plugins/autopair.c
> > @@ -75,7 +75,7 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter,
> >          btd_device_get_product (device));
> >
> >      /* The iCade shouldn't use random PINs like normal keyboards */
> > -    if (name != NULL && strstr(name, "iCade") != NULL)
> > +    if (strstr(name, "iCade") != NULL)
> >          return 0;
> >
> >      /* This is a class-based pincode guesser. Ignore devices with an
> > --
> > 2.17.1

Applied, thanks.

-- 
Luiz Augusto von Dentz

Re: [PATCH] autopair: Fix compiler warning

[Sonny Sasaka]

Thanks, Luiz.

On Thu, Mar 26, 2020 at 2:09 PM Luiz Augusto von Dentz
<luiz.dentz@gmail.com> wrote:
>
> Hi Sonny,
>
> On Thu, Mar 26, 2020 at 10:23 AM Sonny Sasaka <sonnysasaka@chromium.org> wrote:
> >
> > Hi BlueZ maintainers,
> >
> > Could you take a look at this fix? Thank you!
> >
> > On Tue, Mar 24, 2020 at 12:49 PM Sonny Sasaka <sonnysasaka@chromium.org> wrote:
> > >
> > > With clang, comparing an array with NULL generates a warning because the
> > > value is always non-NULL. With maintainer mode enabled, this becomes a
> > > compilation error.
> > > ---
> > >  plugins/autopair.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/plugins/autopair.c b/plugins/autopair.c
> > > index 043bd9b9d..3089430a8 100644
> > > --- a/plugins/autopair.c
> > > +++ b/plugins/autopair.c
> > > @@ -75,7 +75,7 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter,
> > >          btd_device_get_product (device));
> > >
> > >      /* The iCade shouldn't use random PINs like normal keyboards */
> > > -    if (name != NULL && strstr(name, "iCade") != NULL)
> > > +    if (strstr(name, "iCade") != NULL)
> > >          return 0;
> > >
> > >      /* This is a class-based pincode guesser. Ignore devices with an
> > > --
> > > 2.17.1
>
> Applied, thanks.
>
> --
> Luiz Augusto von Dentz