diff --git a/Makefile.am b/Makefile.am index f68e1ecb9..6c10ed302 100644 --- a/Makefile.am +++ b/Makefile.am @@ -137,7 +137,7 @@ src_bluetoothd_SOURCES = $(builtin_sources) \ src/sdp-xml.h src/sdp-xml.c \ src/sdp-client.h src/sdp-client.c \ src/textfile.h src/textfile.c \ - src/glib-helper.h src/glib-helper.c \ + src/uuid-helper.h src/uuid-helper.c \ src/uinput.h \ src/plugin.h src/plugin.c \ src/storage.h src/storage.c \ @@ -225,7 +225,7 @@ AM_CPPFLAGS = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \ unit_tests = unit/test-eir unit/test-uuid unit/test-textfile unit/test-crc -unit_test_eir_SOURCES = unit/test-eir.c src/eir.c src/glib-helper.c +unit_test_eir_SOURCES = unit/test-eir.c src/eir.c src/uuid-helper.c unit_test_eir_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@ unit_test_uuid_SOURCES = unit/test-uuid.c diff --git a/Makefile.tools b/Makefile.tools index cd2d1ca26..73dd221c2 100644 --- a/Makefile.tools +++ b/Makefile.tools @@ -262,7 +262,7 @@ tools_hwdb_LDADD = lib/libbluetooth-internal.la tools_hcieventmask_LDADD = lib/libbluetooth-internal.la -tools_btmgmt_SOURCES = tools/btmgmt.c src/glib-helper.c \ +tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c \ monitor/mainloop.h monitor/mainloop.c \ src/shared/io.h src/shared/io-mainloop.c \ src/shared/queue.h src/shared/queue.c \ diff --git a/android/Makefile.am b/android/Makefile.am index 51dbb8e61..910beb5af 100644 --- a/android/Makefile.am +++ b/android/Makefile.am @@ -21,7 +21,7 @@ android_bluetoothd_SOURCES = android/main.c \ android/utils.h \ src/sdpd-database.c src/sdpd-server.c \ src/sdpd-service.c src/sdpd-request.c \ - src/glib-helper.h src/glib-helper.c \ + src/uuid-helper.h src/uuid-helper.c \ src/eir.h src/eir.c \ src/shared/io.h src/shared/io-glib.c \ src/shared/queue.h src/shared/queue.c \ diff --git a/android/bluetooth.c b/android/bluetooth.c index 83612b454..55fd7194a 100644 --- a/android/bluetooth.c +++ b/android/bluetooth.c @@ -38,7 +38,7 @@ #include "lib/sdp.h" #include "lib/mgmt.h" #include "src/shared/mgmt.h" -#include "src/glib-helper.h" +#include "src/uuid-helper.h" #include "src/eir.h" #include "lib/sdp.h" #include "lib/sdp_lib.h" diff --git a/android/hidhost.c b/android/hidhost.c index 3da77c856..73c5f41ac 100644 --- a/android/hidhost.c +++ b/android/hidhost.c @@ -40,7 +40,7 @@ #include "lib/uuid.h" #include "src/shared/mgmt.h" #include "src/sdp-client.h" -#include "src/glib-helper.h" +#include "src/uuid-helper.h" #include "profiles/input/uhid_copy.h" #include "log.h" diff --git a/android/pan.c b/android/pan.c index 3544d7492..bfba128b8 100644 --- a/android/pan.c +++ b/android/pan.c @@ -39,7 +39,7 @@ #include "lib/bnep.h" #include "lib/sdp.h" #include "lib/sdp_lib.h" -#include "src/glib-helper.h" +#include "src/uuid-helper.h" #include "profiles/network/bnep.h" #include "log.h" diff --git a/profiles/audio/control.c b/profiles/audio/control.c index 5f88a94a5..4692ef053 100644 --- a/profiles/audio/control.c +++ b/profiles/audio/control.c @@ -56,7 +56,7 @@ #include "avctp.h" #include "control.h" #include "sdpd.h" -#include "glib-helper.h" +#include "uuid-helper.h" #include "dbus-common.h" static GSList *devices = NULL; diff --git a/profiles/audio/media.c b/profiles/audio/media.c index 5edd3dee1..12e23a541 100644 --- a/profiles/audio/media.c +++ b/profiles/audio/media.c @@ -40,7 +40,7 @@ #include "src/dbus-common.h" #include "src/profile.h" -#include "glib-helper.h" +#include "uuid-helper.h" #include "log.h" #include "error.h" #include "avdtp.h" diff --git a/profiles/health/hdp_manager.c b/profiles/health/hdp_manager.c index 1bb60071c..168281f2c 100644 --- a/profiles/health/hdp_manager.c +++ b/profiles/health/hdp_manager.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include "hdp_types.h" diff --git a/profiles/health/hdp_util.c b/profiles/health/hdp_util.c index b9a09e99d..433593001 100644 --- a/profiles/health/hdp_util.c +++ b/profiles/health/hdp_util.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include "lib/uuid.h" #include "btio/btio.h" diff --git a/profiles/input/server.c b/profiles/input/server.c index 21c589c52..7a07d0818 100644 --- a/profiles/input/server.c +++ b/profiles/input/server.c @@ -37,7 +37,7 @@ #include "log.h" -#include "glib-helper.h" +#include "uuid-helper.h" #include "btio/btio.h" #include "lib/uuid.h" #include "../src/adapter.h" diff --git a/src/adapter.c b/src/adapter.c index c1175081e..f2d805d1c 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -59,7 +59,7 @@ #include "profile.h" #include "dbus-common.h" #include "error.h" -#include "glib-helper.h" +#include "uuid-helper.h" #include "agent.h" #include "storage.h" #include "attrib/gattrib.h" diff --git a/src/device.c b/src/device.c index 8e2a51578..65bb3c960 100644 --- a/src/device.c +++ b/src/device.c @@ -58,7 +58,7 @@ #include "service.h" #include "dbus-common.h" #include "error.h" -#include "glib-helper.h" +#include "uuid-helper.h" #include "sdp-client.h" #include "attrib/gatt.h" #include "agent.h" diff --git a/src/eir.c b/src/eir.c index d85ac7e20..f18a9189e 100644 --- a/src/eir.c +++ b/src/eir.c @@ -37,7 +37,7 @@ #include #include -#include "glib-helper.h" +#include "uuid-helper.h" #include "eir.h" #define EIR_OOB_MIN (2 + 6) diff --git a/src/profile.c b/src/profile.c index e8331813d..0862a3668 100644 --- a/src/profile.c +++ b/src/profile.c @@ -43,7 +43,7 @@ #include "sdpd.h" #include "log.h" #include "error.h" -#include "glib-helper.h" +#include "uuid-helper.h" #include "dbus-common.h" #include "sdp-client.h" #include "sdp-xml.h" diff --git a/src/storage.c b/src/storage.c index f7e4db6aa..b230e1efc 100644 --- a/src/storage.c +++ b/src/storage.c @@ -44,7 +44,7 @@ #include "lib/uuid.h" #include "textfile.h" -#include "glib-helper.h" +#include "uuid-helper.h" #include "storage.h" /* When all services should trust a remote device */ diff --git a/src/glib-helper.c b/src/uuid-helper.c similarity index 99% rename from src/glib-helper.c rename to src/uuid-helper.c index 4a020e9b1..f9d51eaed 100644 --- a/src/glib-helper.c +++ b/src/uuid-helper.c @@ -34,7 +34,7 @@ #include -#include "glib-helper.h" +#include "uuid-helper.h" char *bt_modalias(uint16_t source, uint16_t vendor, uint16_t product, uint16_t version) diff --git a/src/glib-helper.h b/src/uuid-helper.h similarity index 100% rename from src/glib-helper.h rename to src/uuid-helper.h diff --git a/tools/btmgmt.c b/tools/btmgmt.c index e76b6a863..dde42d7e2 100644 --- a/tools/btmgmt.c +++ b/tools/btmgmt.c @@ -40,7 +40,7 @@ #include #include -#include "glib-helper.h" +#include "uuid-helper.h" #include "monitor/mainloop.h" #include "src/shared/util.h"