Hi Inga,
On Wed, Aug 04, 2010, Inga Stotland wrote:
> ---
> src/adapter.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
> src/adapter.h | 4 +-
> src/dbus-hci.c | 6 ++--
> 3 files changed, 108 insertions(+), 8 deletions(-)
A few more things here:
> +static char **get_eir_uuids(uint8_t *eir_data, size_t *uuid_count)
> +{
> + uint8_t len = 0;
> + char **uuid_buf = NULL;
> + char **uuids;
<snip>
> + uuid_buf = g_new0(char *, total + 1);
> +
> + if (!uuid_buf)
> + return NULL;
> +
> + uuids = uuid_buf;
First of all, g_new0 is guaranteed to return non-NULL. If something goes
wrong with the memory allocation abort() will be called and the process
will exit. So the NULL check is redundant. Secondly, I don't think you
need both of these variables (see further below).
> + for (i = 0; i < uuid16_count; i++) {
> + uint16_t val16 = uuid16[1];
> +
> + val16 = (val16<<8) + uuid16[0];
Space missing before and after <<
> + service.value.uuid16 = val16;
> + *uuids++ = bt_uuid2string(&service);
Instead of incrementing the pointer you could just do
uuids[i] = bt_uuid2string(&service);
That way the original pointer stays unchanged and you don't need the
second one.
Johan
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
