Re: [PATCH BlueZ 01/10] core: Fix remaining references to bluetooth/uuid.h

Re: [PATCH BlueZ 01/10] core: Fix remaining references to bluetooth/uuid.h

[Johan Hedberg]

Hi Lizardo,

On Thu, Jan 10, 2013, Anderson Lizardo wrote:
> These headers are not public anymore, so need to use "lib/uuid.h".
> ---
>  src/attrib-server.c |    2 +-
>  src/main.c          |    2 +-
>  src/storage.c       |    2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)

All patches in this set have been applied. Thanks.

Johan

[PATCH BlueZ 01/10] core: Fix remaining references to bluetooth/uuid.h

[Anderson Lizardo]

These headers are not public anymore, so need to use "lib/uuid.h".
---
 src/attrib-server.c |    2 +-
 src/main.c          |    2 +-
 src/storage.c       |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/attrib-server.c b/src/attrib-server.c
index 0a56942..b2360c3 100644
--- a/src/attrib-server.c
+++ b/src/attrib-server.c
@@ -35,10 +35,10 @@
 #include <sys/file.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/uuid.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
+#include "lib/uuid.h"
 #include <gdbus/gdbus.h>
 #include "log.h"
 #include <btio/btio.h>
diff --git a/src/main.c b/src/main.c
index bd1e9d9..b9fd369 100644
--- a/src/main.c
+++ b/src/main.c
@@ -38,7 +38,6 @@
 #include <sys/stat.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/uuid.h>
 
 #include <glib.h>
 
@@ -48,6 +47,7 @@
 
 #include "log.h"
 
+#include "lib/uuid.h"
 #include "hcid.h"
 #include "sdpd.h"
 #include "adapter.h"
diff --git a/src/storage.c b/src/storage.c
index 8b634ba..f7e4db6 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -41,8 +41,8 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/uuid.h>
 
+#include "lib/uuid.h"
 #include "textfile.h"
 #include "glib-helper.h"
 #include "storage.h"
-- 
1.7.9.5

[PATCH BlueZ 02/10] plugins: Fix remaining references to bluetooth/uuid.h

[Anderson Lizardo]

These headers are not public anymore, so need to use "lib/uuid.h".
---
 plugins/gatt-example.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/gatt-example.c b/plugins/gatt-example.c
index de090e9..bd0fbff 100644
--- a/plugins/gatt-example.c
+++ b/plugins/gatt-example.c
@@ -27,10 +27,10 @@
 #endif
 
 #include <glib.h>
-#include <bluetooth/uuid.h>
 #include <errno.h>
 #include <adapter.h>
 
+#include "lib/uuid.h"
 #include "plugin.h"
 #include "hcid.h"
 #include "log.h"
-- 
1.7.9.5

[PATCH BlueZ 03/10] input: Fix remaining references to bluetooth/uuid.h

[Anderson Lizardo]

These headers are not public anymore, so need to use "lib/uuid.h".
---
 profiles/input/hog.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/input/hog.c b/profiles/input/hog.c
index 7f13abc..7f7bfd2 100644
--- a/profiles/input/hog.c
+++ b/profiles/input/hog.c
@@ -37,12 +37,12 @@
 #include "uhid_copy.h"
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/uuid.h>
 
 #include <glib.h>
 
 #include "log.h"
 
+#include "lib/uuid.h"
 #include "src/adapter.h"
 #include "src/device.h"
 #include "src/profile.h"
-- 
1.7.9.5

[PATCH BlueZ 04/10] gatt: Fix remaining references to bluetooth/uuid.h

[Anderson Lizardo]

These headers are not public anymore, so need to use "lib/uuid.h".
---
 profiles/gatt/gas.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/gatt/gas.c b/profiles/gatt/gas.c
index b5e0e52..429850b 100644
--- a/profiles/gatt/gas.c
+++ b/profiles/gatt/gas.c
@@ -32,9 +32,9 @@
 #include <errno.h>
 
 #include <glib.h>
-#include <bluetooth/uuid.h>
 #include <btio/btio.h>
 
+#include "lib/uuid.h"
 #include "adapter.h"
 #include "device.h"
 #include "attrib/att.h"
-- 
1.7.9.5

[PATCH BlueZ 05/10] scanparam: Fix remaining references to bluetooth/uuid.h

[Anderson Lizardo]

These headers are not public anymore, so need to use "lib/uuid.h".
---
 profiles/scanparam/scan.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/scanparam/scan.c b/profiles/scanparam/scan.c
index 7c21ac3..268bdc8 100644
--- a/profiles/scanparam/scan.c
+++ b/profiles/scanparam/scan.c
@@ -30,8 +30,8 @@
 #include <errno.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/uuid.h>
 
+#include "lib/uuid.h"
 #include "log.h"
 #include "plugin.h"
 #include "adapter.h"
-- 
1.7.9.5

[PATCH BlueZ 06/10] alert: Fix remaining references to bluetooth/uuid.h

[Anderson Lizardo]

These headers are not public anymore, so need to use "lib/uuid.h".
---
 profiles/alert/server.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/alert/server.c b/profiles/alert/server.c
index 3736a0b..4536c81 100644
--- a/profiles/alert/server.c
+++ b/profiles/alert/server.c
@@ -30,9 +30,9 @@
 #include <errno.h>
 #include <gdbus/gdbus.h>
 #include <glib.h>
-#include <bluetooth/uuid.h>
 #include <stdlib.h>
 
+#include "lib/uuid.h"
 #include "plugin.h"
 #include "dbus-common.h"
 #include "attrib/att.h"
-- 
1.7.9.5

[PATCH BlueZ 07/10] time: Fix remaining references to bluetooth/uuid.h

[Anderson Lizardo]

These headers are not public anymore, so need to use "lib/uuid.h".
---
 profiles/time/server.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/profiles/time/server.c b/profiles/time/server.c
index ab9fbb4..518a29f 100644
--- a/profiles/time/server.c
+++ b/profiles/time/server.c
@@ -31,13 +31,12 @@
 #include <errno.h>
 #include <stdbool.h>
 
-#include <bluetooth/uuid.h>
-
 #include <adapter.h>
 #include <device.h>
 #include <profile.h>
 #include <plugin.h>
 
+#include "lib/uuid.h"
 #include "attrib/gattrib.h"
 #include "attrib/att.h"
 #include "attrib/gatt.h"
-- 
1.7.9.5

[PATCH BlueZ 08/10] proximity: Fix remaining references to bluetooth/uuid.h

[Anderson Lizardo]

These headers are not public anymore, so need to use "lib/uuid.h".
---
 profiles/proximity/immalert.c |    2 +-
 profiles/proximity/linkloss.c |    2 +-
 profiles/proximity/monitor.c  |    2 +-
 profiles/proximity/reporter.c |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/profiles/proximity/immalert.c b/profiles/proximity/immalert.c
index 04557b4..06e8eb8 100644
--- a/profiles/proximity/immalert.c
+++ b/profiles/proximity/immalert.c
@@ -27,12 +27,12 @@
 #include <stdbool.h>
 
 #include <glib.h>
-#include <bluetooth/uuid.h>
 #include <adapter.h>
 
 #include <dbus/dbus.h>
 #include <gdbus/gdbus.h>
 
+#include "lib/uuid.h"
 #include "log.h"
 #include "attrib/gattrib.h"
 #include "attrib/att.h"
diff --git a/profiles/proximity/linkloss.c b/profiles/proximity/linkloss.c
index c1c4177..cb87b12 100644
--- a/profiles/proximity/linkloss.c
+++ b/profiles/proximity/linkloss.c
@@ -27,12 +27,12 @@
 #include <stdbool.h>
 
 #include <glib.h>
-#include <bluetooth/uuid.h>
 #include <adapter.h>
 
 #include <dbus/dbus.h>
 #include <gdbus/gdbus.h>
 
+#include "lib/uuid.h"
 #include "log.h"
 #include "attrib/att-database.h"
 #include "attrib/gattrib.h"
diff --git a/profiles/proximity/monitor.c b/profiles/proximity/monitor.c
index e502605..37b02e1 100644
--- a/profiles/proximity/monitor.c
+++ b/profiles/proximity/monitor.c
@@ -36,8 +36,8 @@
 #include <sys/stat.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/uuid.h>
 
+#include "lib/uuid.h"
 #include "dbus-common.h"
 #include "adapter.h"
 #include "device.h"
diff --git a/profiles/proximity/reporter.c b/profiles/proximity/reporter.c
index ef3ab6a..31c33ef 100644
--- a/profiles/proximity/reporter.c
+++ b/profiles/proximity/reporter.c
@@ -30,7 +30,6 @@
 #include <errno.h>
 
 #include <glib.h>
-#include <bluetooth/uuid.h>
 #include <adapter.h>
 
 #include <dbus/dbus.h>
@@ -38,6 +37,7 @@
 
 #include "log.h"
 
+#include "lib/uuid.h"
 #include "dbus-common.h"
 #include "error.h"
 #include "device.h"
-- 
1.7.9.5

[PATCH BlueZ 09/10] attrib: Fix remaining references to bluetooth/uuid.h

[Anderson Lizardo]

These headers are not public anymore, so need to use "lib/uuid.h".
---
 attrib/att.c          |    2 +-
 attrib/gatt-service.c |    2 +-
 attrib/gatt.c         |    2 +-
 attrib/gattrib.c      |    4 ++--
 attrib/gatttool.c     |    2 +-
 attrib/interactive.c  |    3 +--
 attrib/utils.c        |    2 +-
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/attrib/att.c b/attrib/att.c
index de11811..b26273e 100644
--- a/attrib/att.c
+++ b/attrib/att.c
@@ -31,10 +31,10 @@
 #include <stdlib.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/uuid.h>
 
 #include <glib.h>
 
+#include "lib/uuid.h"
 #include "att.h"
 
 const char *att_ecode2str(uint8_t status)
diff --git a/attrib/gatt-service.c b/attrib/gatt-service.c
index e8788d9..bdb12cd 100644
--- a/attrib/gatt-service.c
+++ b/attrib/gatt-service.c
@@ -27,10 +27,10 @@
 #endif
 
 #include <glib.h>
-#include <bluetooth/uuid.h>
 #include <bluetooth/sdp.h>
 #include <adapter.h>
 
+#include "lib/uuid.h"
 #include "gattrib.h"
 #include "att.h"
 #include "gatt.h"
diff --git a/attrib/gatt.c b/attrib/gatt.c
index 38c050e..d54feac 100644
--- a/attrib/gatt.c
+++ b/attrib/gatt.c
@@ -29,10 +29,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <glib.h>
-#include <bluetooth/uuid.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
+#include "lib/uuid.h"
 #include "att.h"
 #include "gattrib.h"
 #include "gatt.h"
diff --git a/attrib/gattrib.c b/attrib/gattrib.c
index bf40532..58f19d0 100644
--- a/attrib/gattrib.c
+++ b/attrib/gattrib.c
@@ -33,9 +33,9 @@
 #include <stdio.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/uuid.h>
-
 #include <btio/btio.h>
+
+#include "lib/uuid.h"
 #include "log.h"
 #include "att.h"
 #include "gattrib.h"
diff --git a/attrib/gatttool.c b/attrib/gatttool.c
index e66059d..29e3261 100644
--- a/attrib/gatttool.c
+++ b/attrib/gatttool.c
@@ -34,8 +34,8 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
 #include <bluetooth/hci_lib.h>
-#include <bluetooth/uuid.h>
 
+#include "lib/uuid.h"
 #include "att.h"
 #include <btio/btio.h>
 #include "gattrib.h"
diff --git a/attrib/interactive.c b/attrib/interactive.c
index 51f620a..a99ad0a 100644
--- a/attrib/interactive.c
+++ b/attrib/interactive.c
@@ -31,11 +31,10 @@
 #include <stdio.h>
 #include <glib.h>
 
-#include <bluetooth/uuid.h>
-
 #include <readline/readline.h>
 #include <readline/history.h>
 
+#include "lib/uuid.h"
 #include <btio/btio.h>
 #include "att.h"
 #include "gattrib.h"
diff --git a/attrib/utils.c b/attrib/utils.c
index 43244c2..f9813d1 100644
--- a/attrib/utils.c
+++ b/attrib/utils.c
@@ -31,9 +31,9 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
 #include <bluetooth/hci_lib.h>
-#include <bluetooth/uuid.h>
 #include <bluetooth/sdp.h>
 
+#include "lib/uuid.h"
 #include <btio/btio.h>
 #include "att.h"
 #include "gattrib.h"
-- 
1.7.9.5

[PATCH BlueZ 10/10] unit: Fix remaining references to bluetooth/uuid.h

[Anderson Lizardo]

These headers are not public anymore, so need to use "lib/uuid.h".
---
 unit/test-uuid.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/unit/test-uuid.c b/unit/test-uuid.c
index cbccc82..79ab3e6 100644
--- a/unit/test-uuid.c
+++ b/unit/test-uuid.c
@@ -28,7 +28,8 @@
 #include <glib.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/uuid.h>
+
+#include "lib/uuid.h"
 
 struct uuid_test_data {
 	const char *str;
-- 
1.7.9.5