2020-03-24 19:51:26

by Sonny Sasaka

Subject: [PATCH] autopair: Fix compiler warning

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

2020-03-26 17:21:44

by Sonny Sasaka

Subject: Re: [PATCH] autopair: Fix compiler warning

Hi BlueZ maintainers,

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

On Tue, Mar 24, 2020 at 12:49 PM Sonny Sasaka <[email protected]> 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

2020-03-26 21:09:23

by Luiz Augusto von Dentz

Subject: Re: [PATCH] autopair: Fix compiler warning

Hi Sonny,

On Thu, Mar 26, 2020 at 10:23 AM Sonny Sasaka <[email protected]> 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 <[email protected]> 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

2020-03-26 21:13:34

by Sonny Sasaka

Subject: Re: [PATCH] autopair: Fix compiler warning

Thanks, Luiz.

On Thu, Mar 26, 2020 at 2:09 PM Luiz Augusto von Dentz
<[email protected]> wrote:
>
> Hi Sonny,
>
> On Thu, Mar 26, 2020 at 10:23 AM Sonny Sasaka <[email protected]> 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 <[email protected]> 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