]> code.delx.au - pulseaudio/commitdiff
bluetooth: Fix using pointer-pointer when appending an array as variant
authorLuiz Augusto von Dentz <luiz.dentz-von@nokia.com>
Fri, 29 Apr 2011 14:48:06 +0000 (17:48 +0300)
committerColin Guthrie <colin@mageia.org>
Sat, 30 Apr 2011 13:26:45 +0000 (14:26 +0100)
pa_dbus_append_basic_array_variant_dict_entry should take the direct
pointer to the array.

src/modules/bluetooth/bluetooth-util.c

index 740b317ab839f5dda80c50601f81e5c943167938..597a39d0a91c557739b0e9375dcbf838239c3c7e 100644 (file)
@@ -631,11 +631,9 @@ static void register_endpoint(pa_bluetooth_discovery *y, const char *path, const
 
     if (pa_streq(uuid, HFP_AG_UUID)) {
         uint8_t capability = 0;
-        uint8_t *caps = &capability;
-        pa_dbus_append_basic_array_variant_dict_entry(&d, "Capabilities", DBUS_TYPE_BYTE, &caps, 1);
+        pa_dbus_append_basic_array_variant_dict_entry(&d, "Capabilities", DBUS_TYPE_BYTE, &capability, 1);
     } else {
         a2dp_sbc_t capabilities;
-        uint8_t *caps = (uint8_t *) &capabilities;
 
         capabilities.channel_mode = BT_A2DP_CHANNEL_MODE_MONO | BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL |
                                     BT_A2DP_CHANNEL_MODE_STEREO | BT_A2DP_CHANNEL_MODE_JOINT_STEREO;
@@ -648,7 +646,7 @@ static void register_endpoint(pa_bluetooth_discovery *y, const char *path, const
         capabilities.min_bitpool = MIN_BITPOOL;
         capabilities.max_bitpool = MAX_BITPOOL;
 
-        pa_dbus_append_basic_array_variant_dict_entry(&d, "Capabilities", DBUS_TYPE_BYTE, &caps, sizeof(capabilities));
+        pa_dbus_append_basic_array_variant_dict_entry(&d, "Capabilities", DBUS_TYPE_BYTE, &capabilities, sizeof(capabilities));
     }
 
     dbus_message_iter_close_container(&i, &d);