summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--hcid/adapter.c4
-rw-r--r--hcid/device.c6
-rw-r--r--hcid/device.h10
3 files changed, 10 insertions, 10 deletions
diff --git a/hcid/adapter.c b/hcid/adapter.c
index 313e5a06..34e74645 100644
--- a/hcid/adapter.c
+++ b/hcid/adapter.c
@@ -3354,7 +3354,7 @@ static void discover_services_cb(gpointer user_data, sdp_list_t *recs, int err)
str2ba(adapter->address, &src);
str2ba(adapter->create->address, &dst);
if (uuids) {
- char *str = bt_list2string(uuids);
+ gchar *str = bt_list2string(uuids);
write_device_profiles(&src, &dst, str);
g_free(str);
} else
@@ -3372,7 +3372,7 @@ static DBusHandlerResult create_device(DBusConnection *conn,
{
struct adapter *adapter = data;
struct create_device_req *create;
- const char *address;
+ const gchar *address;
bdaddr_t src, dst;
int err;
diff --git a/hcid/device.c b/hcid/device.c
index 840f8d1f..fa1b9b7e 100644
--- a/hcid/device.c
+++ b/hcid/device.c
@@ -883,8 +883,8 @@ static DBusSignalVTable device_signals[] = {
{ NULL, NULL }
};
-const char *device_create(struct adapter *adapter,
- const char *address, GSList *uuids)
+const gchar *device_create(struct adapter *adapter,
+ const gchar *address, GSList *uuids)
{
struct device *device;
@@ -916,6 +916,6 @@ const char *device_create(struct adapter *adapter,
return device->path;
}
-void device_remove(const char *path)
+void device_remove(const gchar *path)
{
}
diff --git a/hcid/device.h b/hcid/device.h
index cdb68a50..d8dca25f 100644
--- a/hcid/device.h
+++ b/hcid/device.h
@@ -23,8 +23,8 @@
*/
struct device {
- char *address;
- char *path;
+ gchar *address;
+ gchar *path;
struct adapter *adapter;
GSList *uuids;
};
@@ -32,6 +32,6 @@ struct device {
gboolean device_init(DBusConnection *conn);
void device_cleanup(void);
void device_foreach(GFunc func, gpointer user_data);
-const char *device_create(struct adapter *adapter,
- const char *address, GSList *uuids);
-void device_remove(const char *path);
+const gchar *device_create(struct adapter *adapter,
+ const gchar *address, GSList *uuids);
+void device_remove(const gchar *path);