mirrors
/
gattlib
mirror of https://github.com/labapart/gattlib
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix problem with gvariant formatting causing GLib format errors

pull/46/head
csl 2017-09-08 12:31:49 +02:00 committed by Olivier Martin
parent 4af454d026
commit 01d5c51a0c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dbus/gattlib.c
View File

@ -788,9 +788,10 @@ int gattlib_read_char_by_uuid(gatt_connection_t* connection, uuid_t* uuid, void*
org_bluez_gatt_characteristic1_call_read_value_sync(
characteristic, &out_value, NULL, &error);
#else
GVariant *options = g_variant_new ("{}");
GVariantBuilder *options = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
org_bluez_gatt_characteristic1_call_read_value_sync(
characteristic, options, &out_value, NULL, &error);
characteristic, g_variant_builder_end(options), &out_value, NULL, &error);
g_variant_builder_unref(options);
#endif
if (error != NULL) {
return -1;
@ -826,9 +827,10 @@ int gattlib_read_char_by_uuid_async(gatt_connection_t* connection, uuid_t* uuid,
org_bluez_gatt_characteristic1_call_read_value_sync(
characteristic, &out_value, NULL, &error);
#else
GVariant *options = g_variant_new ("{}");
GVariantBuilder *options = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
org_bluez_gatt_characteristic1_call_read_value_sync(
characteristic, options, &out_value, NULL, &error);
characteristic, g_variant_builder_end(options), &out_value, NULL, &error);
g_variant_builder_unref(options);
#endif
if (error != NULL) {
return -1;
@ -860,8 +862,9 @@ int gattlib_write_char_by_uuid(gatt_connection_t* connection, uuid_t* uuid, cons
#if BLUEZ_VERSION < BLUEZ_VERSIONS(5, 40)
org_bluez_gatt_characteristic1_call_write_value_sync(characteristic, value, NULL, &error);
#else
GVariant *options = g_variant_new ("{}");
org_bluez_gatt_characteristic1_call_write_value_sync(characteristic, options, value, NULL, &error);
GVariantBuilder *options = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
org_bluez_gatt_characteristic1_call_write_value_sync(characteristic, g_variant_builder_end(options), value, NULL, &error);
g_variant_builder_unref(options);
#endif
if (error != NULL) {
return -1;