2014-04-02 21:06:56

by Claudio Takahasi

Subject: [PATCH BlueZ] Remove unneeded headers include

---
plugins/gatt-example.c | 1 -
profiles/proximity/main.c | 1 -
profiles/proximity/reporter.c | 2 --
src/attrib-server.c | 4 ----
4 files changed, 8 deletions(-)

diff --git a/plugins/gatt-example.c b/plugins/gatt-example.c
index 1e1483c..6e20b1f 100644
--- a/plugins/gatt-example.c
+++ b/plugins/gatt-example.c
@@ -32,7 +32,6 @@
#include "lib/uuid.h"
#include "src/plugin.h"
#include "src/adapter.h"
-#include "src/hcid.h"
#include "src/shared/util.h"
#include "src/log.h"
#include "attrib/gattrib.h"
diff --git a/profiles/proximity/main.c b/profiles/proximity/main.c
index d4fe419..8a350d4 100644
--- a/profiles/proximity/main.c
+++ b/profiles/proximity/main.c
@@ -33,7 +33,6 @@

#include "src/log.h"
#include "src/plugin.h"
-#include "src/hcid.h"
#include "manager.h"

static GKeyFile *config = NULL;
diff --git a/profiles/proximity/reporter.c b/profiles/proximity/reporter.c
index 3e4c741..fb91bc1 100644
--- a/profiles/proximity/reporter.c
+++ b/profiles/proximity/reporter.c
@@ -38,13 +38,11 @@

#include "lib/uuid.h"
#include "src/dbus-common.h"
-#include "src/error.h"
#include "src/adapter.h"
#include "src/device.h"
#include "src/profile.h"
#include "src/service.h"
#include "src/shared/util.h"
-#include "src/hcid.h"
#include "attrib/gattrib.h"
#include "attrib/att.h"
#include "attrib/gatt.h"
diff --git a/src/attrib-server.c b/src/attrib-server.c
index ed843d0..e65fff2 100644
--- a/src/attrib-server.c
+++ b/src/attrib-server.c
@@ -38,13 +38,9 @@
#include <bluetooth/sdp.h>
#include <bluetooth/sdp_lib.h>

-#include <gdbus/gdbus.h>
-
#include "lib/uuid.h"
#include "btio/btio.h"
#include "log.h"
-#include "sdpd.h"
-#include "hcid.h"
#include "adapter.h"
#include "device.h"
#include "src/shared/util.h"
--
1.8.3.1

2014-04-04 18:22:29

by Johan Hedberg

Subject: Re: [PATCH BlueZ] Remove unneeded headers include

Hi Claudio,

On Wed, Apr 02, 2014, Claudio Takahasi wrote:
> ---
> plugins/gatt-example.c | 1 -
> profiles/proximity/main.c | 1 -
> profiles/proximity/reporter.c | 2 --
> src/attrib-server.c | 4 ----
> 4 files changed, 8 deletions(-)

This patch has been applied. Thanks.

Johan

2014-04-02 21:19:24

by Szymon Janc

Subject: Re: [PATCH BlueZ] android: Fix minor typo

Hi Claudio,

On Wednesday 02 April 2014 18:06:57 Claudio Takahasi wrote:
> ---
> android/hardware/bt_gatt_server.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/android/hardware/bt_gatt_server.h
> b/android/hardware/bt_gatt_server.h index 1a5a400..751d852 100644
> --- a/android/hardware/bt_gatt_server.h
> +++ b/android/hardware/bt_gatt_server.h
> @@ -172,4 +172,4 @@ typedef struct {
>
> __END_DECLS
>
> -#endif /* ANDROID_INCLUDE_BT_GATT_CLIENT_H */
> +#endif /* ANDROID_INCLUDE_BT_GATT_SERVER_H */

This is imported from Android and I'd prefer to keep this unmodified (and
other headers from android/hardware). Only exception would be fixing
compilation issue on Linux.

--
Szymon K. Janc
[email protected]

2014-04-02 21:06:57

by Claudio Takahasi

Subject: [PATCH BlueZ] android: Fix minor typo

---
android/hardware/bt_gatt_server.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/hardware/bt_gatt_server.h b/android/hardware/bt_gatt_server.h
index 1a5a400..751d852 100644
--- a/android/hardware/bt_gatt_server.h
+++ b/android/hardware/bt_gatt_server.h
@@ -172,4 +172,4 @@ typedef struct {

__END_DECLS

-#endif /* ANDROID_INCLUDE_BT_GATT_CLIENT_H */
+#endif /* ANDROID_INCLUDE_BT_GATT_SERVER_H */
--
1.8.3.1