diff mbox series

[BlueZ,v5,1/8] adapter: Remove indirect dependency of headers

Message ID 20200911235104.BlueZ.v5.1.Iaa9dc2a66de5fbfa97627e1dbeb800116d3aa91e@changeid (mailing list archive)
State Accepted
Headers show
Series [BlueZ,v5,1/8] adapter: Remove indirect dependency of headers | expand

Commit Message

Miao-chen Chou Sept. 12, 2020, 6:51 a.m. UTC
Given that adapter.h refers symbols from lib/bluetooth.h and lib/sdp.h,
these two headers should be included directly in adapter.h.

Reviewed-by: Manish Mandlik <mmandlik@chromium.org>
---

(no changes since v1)

 src/adapter.h | 3 +++
 1 file changed, 3 insertions(+)

Comments

bluez.test.bot@gmail.com Sept. 12, 2020, 7:32 a.m. UTC | #1
This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
While we are preparing for reviewing the patches, we found the following
issue/warning.

Test Result:
checkbuild Failed

Outputs:
ar: `u' modifier ignored since `D' is the default (see `U')
ar: `u' modifier ignored since `D' is the default (see `U')
ar: `u' modifier ignored since `D' is the default (see `U')
ar: `u' modifier ignored since `D' is the default (see `U')
ar: `u' modifier ignored since `D' is the default (see `U')
src/adv_monitor.c: In function ‘monitor_match’:
src/adv_monitor.c:276:38: error: passing argument 1 of ‘g_dbus_proxy_get_path’ discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
  276 |  if (g_strcmp0(g_dbus_proxy_get_path(proxy), monitor->path) != 0)
      |                                      ^~~~~
In file included from src/adv_monitor.c:31:
./gdbus/gdbus.h:336:13: note: expected ‘GDBusProxy *’ {aka ‘struct GDBusProxy *’} but argument is of type ‘const GDBusProxy *’ {aka ‘const struct GDBusProxy *’}
  336 | const char *g_dbus_proxy_get_path(GDBusProxy *proxy);
      |             ^~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:9272: src/bluetoothd-adv_monitor.o] Error 1
make: *** [Makefile:4014: all] Error 2



---
Regards,
Linux Bluetooth
Luiz Augusto von Dentz Sept. 14, 2020, 7:47 p.m. UTC | #2
Hi Miao,

On Fri, Sep 11, 2020 at 11:53 PM Miao-chen Chou <mcchou@chromium.org> wrote:
>
> Given that adapter.h refers symbols from lib/bluetooth.h and lib/sdp.h,
> these two headers should be included directly in adapter.h.
>
> Reviewed-by: Manish Mandlik <mmandlik@chromium.org>
> ---
>
> (no changes since v1)
>
>  src/adapter.h | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/src/adapter.h b/src/adapter.h
> index f8ac20261..c70a7b0da 100644
> --- a/src/adapter.h
> +++ b/src/adapter.h
> @@ -26,6 +26,9 @@
>  #include <dbus/dbus.h>
>  #include <glib.h>
>
> +#include <lib/bluetooth.h>
> +#include <lib/sdp.h>
> +
>  #define MAX_NAME_LENGTH                248
>
>  /* Invalid SSP passkey value used to indicate negative replies */
> --
> 2.26.2

Applied, thanks. Note that I did introduce a path to fix the build
problem with  g_dbus_proxy_get_path.
Miao-chen Chou Sept. 15, 2020, 7:29 p.m. UTC | #3
Hi Luiz,

Thanks for the extra fix to get this series through! We're waiting for
further comments on
https://patchwork.kernel.org/project/bluetooth/list/?series=348071.

Regards,
Miao

On Mon, Sep 14, 2020 at 12:48 PM Luiz Augusto von Dentz
<luiz.dentz@gmail.com> wrote:
>
> Hi Miao,
>
> On Fri, Sep 11, 2020 at 11:53 PM Miao-chen Chou <mcchou@chromium.org> wrote:
> >
> > Given that adapter.h refers symbols from lib/bluetooth.h and lib/sdp.h,
> > these two headers should be included directly in adapter.h.
> >
> > Reviewed-by: Manish Mandlik <mmandlik@chromium.org>
> > ---
> >
> > (no changes since v1)
> >
> >  src/adapter.h | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/src/adapter.h b/src/adapter.h
> > index f8ac20261..c70a7b0da 100644
> > --- a/src/adapter.h
> > +++ b/src/adapter.h
> > @@ -26,6 +26,9 @@
> >  #include <dbus/dbus.h>
> >  #include <glib.h>
> >
> > +#include <lib/bluetooth.h>
> > +#include <lib/sdp.h>
> > +
> >  #define MAX_NAME_LENGTH                248
> >
> >  /* Invalid SSP passkey value used to indicate negative replies */
> > --
> > 2.26.2
>
> Applied, thanks. Note that I did introduce a path to fix the build
> problem with  g_dbus_proxy_get_path.
>
> --
> Luiz Augusto von Dentz
Luiz Augusto von Dentz Sept. 15, 2020, 7:53 p.m. UTC | #4
Hi Miao,

On Tue, Sep 15, 2020 at 12:29 PM Miao-chen Chou <mcchou@chromium.org> wrote:
>
> Hi Luiz,
>
> Thanks for the extra fix to get this series through! We're waiting for
> further comments on
> https://patchwork.kernel.org/project/bluetooth/list/?series=348071.

Weird, I don't seem to have received this series.

> Regards,
> Miao
>
> On Mon, Sep 14, 2020 at 12:48 PM Luiz Augusto von Dentz
> <luiz.dentz@gmail.com> wrote:
> >
> > Hi Miao,
> >
> > On Fri, Sep 11, 2020 at 11:53 PM Miao-chen Chou <mcchou@chromium.org> wrote:
> > >
> > > Given that adapter.h refers symbols from lib/bluetooth.h and lib/sdp.h,
> > > these two headers should be included directly in adapter.h.
> > >
> > > Reviewed-by: Manish Mandlik <mmandlik@chromium.org>
> > > ---
> > >
> > > (no changes since v1)
> > >
> > >  src/adapter.h | 3 +++
> > >  1 file changed, 3 insertions(+)
> > >
> > > diff --git a/src/adapter.h b/src/adapter.h
> > > index f8ac20261..c70a7b0da 100644
> > > --- a/src/adapter.h
> > > +++ b/src/adapter.h
> > > @@ -26,6 +26,9 @@
> > >  #include <dbus/dbus.h>
> > >  #include <glib.h>
> > >
> > > +#include <lib/bluetooth.h>
> > > +#include <lib/sdp.h>
> > > +
> > >  #define MAX_NAME_LENGTH                248
> > >
> > >  /* Invalid SSP passkey value used to indicate negative replies */
> > > --
> > > 2.26.2
> >
> > Applied, thanks. Note that I did introduce a path to fix the build
> > problem with  g_dbus_proxy_get_path.
> >
> > --
> > Luiz Augusto von Dentz
diff mbox series

Patch

diff --git a/src/adapter.h b/src/adapter.h
index f8ac20261..c70a7b0da 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -26,6 +26,9 @@ 
 #include <dbus/dbus.h>
 #include <glib.h>
 
+#include <lib/bluetooth.h>
+#include <lib/sdp.h>
+
 #define MAX_NAME_LENGTH		248
 
 /* Invalid SSP passkey value used to indicate negative replies */