shared: Add single-link list implementation
Subsystems (2)
PATCH 1/3 shared: Add single-link list implementation
This will allow some parts of the project to stop relying on glib headers without linking to glib, or glib dependencies being introduced in shared sources that need to be able not to link with glib.
ell doesn't include any linked-list API either, so it's glib or home-made.
--- Makefile.am | 5 +++ src/shared/list.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++ src/shared/list.h | 26 ++++++++++++++ unit/test-list.c | 68 +++++++++++++++++++++++++++++++++++ 4 files changed, 189 insertions(+) create mode 100644 src/shared/list.c create mode 100644 src/shared/list.h create mode 100644 unit/test-list.c
Makefile.am +5 -0
@@ -214,6 +214,7 @@ endif shared_sources = src/shared/io.h src/shared/timeout.h \ src/shared/queue.h src/shared/queue.c \ src/shared/util.h src/shared/util.c \ + src/shared/list.h src/shared/list.c \ src/shared/mgmt.h src/shared/mgmt.c \ src/shared/crypto.h src/shared/crypto.c \ src/shared/ecc.h src/shared/ecc.c \
@@ -700,6 +701,10 @@ unit_tests += unit/test-util unit_test_util_LDADD = src/libshared-glib.la \ lib/libbluetooth-internal.la $(GLIB_LIBS) +unit_tests += unit/test-list +unit_test_list_LDADD = src/libshared-glib.la \ + lib/libbluetooth-internal.la $(GLIB_LIBS) + unit_tests += unit/test-gatt unit_test_gatt_SOURCES = unit/test-gatt.c
src/shared/list.c new file +90 -0
90 lines not on this page · raw message
src/shared/list.h new file +26 -0
@@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* +* +* BlueZ - Bluetooth protocol stack for Linux +* +* Copyright (C) 2026 Bastien Nocera <[email protected]> +* +* +*/ + +#pragma once + +typedef struct slist { +void *next; +void *data; +}slist_t ; + +typedef void (*free_func ) (void *data); +typedef int (*compare_func ) (const void *a,const void *b); +typedef void (*foreach_func ) (void *data,void *user_data); + +slist_t *slist_append (slist_t *list,void *data); +void slist_clear (slist_t *list,free_func func); +void slist_free (slist_t *list); +slist_t *slist_find (slist_t *list,const void *data,compare_func func); +void slist_foreach (slist_t *list,foreach_func func,void *user_data);
unit/test-list.c new file +68 -0
68 lines not on this page · raw message
Signature · 1 line
2.53.0
PATCH 2/3 shared: Remove glib dependency from src/shared/ad.c
src/shared/ad.c includes src/eir.h, which uses glib, which means that the non-glib shared library can't be used without linking to glib.
Use our own linked list implementation to remove the glib use.
--- plugins/neard.c | 4 ++-- src/adapter.c | 9 +++++---- src/device.c | 22 +++++++++++----------- src/device.h | 10 ++++++---- src/eir.c | 24 ++++++++++++------------ src/eir.h | 11 +++++------ unit/test-eir.c | 5 ++--- 7 files changed, 43 insertions(+), 42 deletions(-)
plugins/neard.c +2 -2
@@ -58,7 +58,7 @@ struct oob_params {bdaddr_t address;uint32_t class;char *name; -GSList *services; +slist_t *services;uint8_t *hash;uint8_t *randomizer;uint8_t *pin;
@@ -68,7 +68,7 @@ struct oob_params {static void free_oob_params (struct oob_params *params) { -g_slist_free_full (params->services, free); +slist_clear (params->services, free);g_free (params->name);g_free (params->hash);g_free (params->randomizer);
src/adapter.c +5 -4
@@ -43,6 +43,7 @@#include "textfile.h" #include "src/shared/util.h" +#include "src/shared/list.h" #include "src/shared/queue.h" #include "src/shared/att.h" #include "src/shared/gatt-db.h"
@@ -7171,10 +7172,10 @@ static void confirm_name(struct btd_adapter *adapter, const bdaddr_t *bdaddr,static void adapter_msd_notify (struct btd_adapter *adapter,struct btd_device *dev, -GSList *msd_list) +slist_t *msd_list) {GSList *cb_l, *cb_next; -GSList *msd_l, *msd_next; +slist_t *msd_l, *msd_next;for (cb_l = adapter->msd_callbacks; cb_l !=NULL ; cb_l = cb_next) {btd_msd_cb_t cb = cb_l->data;
@@ -7184,7 +7185,7 @@ static void adapter_msd_notify(struct btd_adapter *adapter,for (msd_l = msd_list; msd_l !=NULL ; msd_l = msd_next) {const struct eir_msd *msd = msd_l->data; - msd_next =g_slist_next (msd_l); + msd_next = msd_l->next;cb (adapter, dev, msd->company, msd->data, msd->data_len);
@@ -7223,7 +7224,7 @@ static bool is_filter_match(GSList *discovery_filter, struct eir_data *eir_data,/* m->data contains string representation of * uuid. */ -if (g_slist_find_custom (eir_data->services, +if (slist_find (eir_data->services, m->data, g_strcmp) !=NULL ) got_match = true;
src/device.c +11 -11
@@ -2432,9 +2432,9 @@ unref: dev->connect =NULL ; } -void device_add_eir_uuids (struct btd_device *dev,GSList *uuids) +void device_add_eir_uuids (struct btd_device *dev,slist_t *uuids) { -GSList *l; +slist_t *l;GSList *added =NULL ;if (dev->bredr_state.svc_resolved || dev->le_state.svc_resolved)
@@ -2465,13 +2465,13 @@ static void add_manufacturer_data(void *data, void *user_data) DEVICE_INTERFACE, "ManufacturerData"); } -void device_set_manufacturer_data (struct btd_device *dev,GSList *list, +void device_set_manufacturer_data (struct btd_device *dev,slist_t *list,bool duplicate) {if (duplicate)bt_ad_clear_manufacturer_data (dev->ad); -g_slist_foreach (list, add_manufacturer_data, dev); +slist_foreach (list, add_manufacturer_data, dev); }static void add_service_data (void *data,void *user_data)
@@ -2479,7 +2479,7 @@ static void add_service_data(void *data, void *user_data)struct eir_sd *sd = data;struct btd_device *dev = user_data;bt_uuid_t uuid; -GSList *l; +slist_t *l;if (bt_string_to_uuid (&uuid, sd->uuid) <0 )return ;
@@ -2487,21 +2487,21 @@ static void add_service_data(void *data, void *user_data)if (!bt_ad_add_service_data (dev->ad, &uuid, sd->data, sd->data_len))return ; - l =g_slist_append (NULL , sd->uuid); + l =slist_append (NULL , sd->uuid);device_add_eir_uuids (dev, l); -g_slist_free (l); +slist_free (l);g_dbus_emit_property_changed (dbus_conn, dev->path,DEVICE_INTERFACE ,"ServiceData" ); } -void device_set_service_data (struct btd_device *dev,GSList *list, +void device_set_service_data (struct btd_device *dev,slist_t *list,bool duplicate) {if (duplicate)bt_ad_clear_service_data (dev->ad); -g_slist_foreach (list, add_service_data, dev); +slist_foreach (list, add_service_data, dev); }static void add_data (void *data,void *user_data)
@@ -2518,13 +2518,13 @@ static void add_data(void *data, void *user_data) "AdvertisingData"); } -void device_set_data (struct btd_device *dev,GSList *list, +void device_set_data (struct btd_device *dev,slist_t *list,bool duplicate) {if (duplicate)bt_ad_clear_data (dev->ad); -g_slist_foreach (list, add_data, dev); +slist_foreach (list, add_data, dev); } static struct btd_service *find_connectable_service(struct btd_device *dev,
src/device.h +6 -4
@@ -9,6 +9,8 @@* */ +#include "src/shared/list.h" +#define DEVICE_INTERFACE "org.bluez.Device1"struct btd_device ;
@@ -78,12 +80,12 @@ void btd_device_gatt_set_service_changed(struct btd_device *device, uint16_t start, uint16_t end);bool device_attach_att (struct btd_device *dev,GIOChannel *io);void btd_device_add_uuid (struct btd_device *device,const char *uuid); -void device_add_eir_uuids (struct btd_device *dev,GSList *uuids); -void device_set_manufacturer_data (struct btd_device *dev,GSList *list, +void device_add_eir_uuids (struct btd_device *dev,slist_t *uuids); +void device_set_manufacturer_data (struct btd_device *dev,slist_t *list,bool duplicate); -void device_set_service_data (struct btd_device *dev,GSList *list, +void device_set_service_data (struct btd_device *dev,slist_t *list,bool duplicate); -void device_set_data (struct btd_device *dev,GSList *list, +void device_set_data (struct btd_device *dev,slist_t *list,bool duplicate);void device_probe_profile (gpointer a,gpointer b);void device_remove_profile (gpointer a,gpointer b);
src/eir.c +12 -12
@@ -49,7 +49,7 @@ static void data_free(void *data)void eir_data_free (struct eir_data *eir) { -g_slist_free_full (eir->services, free); +slist_clear (eir->services, free); eir->services =NULL ;g_free (eir->name); eir->name =NULL ;
@@ -57,11 +57,11 @@ void eir_data_free(struct eir_data *eir) eir->hash =NULL ;free (eir->randomizer); eir->randomizer =NULL ; -g_slist_free_full (eir->msd_list, g_free); +slist_clear (eir->msd_list, g_free); eir->msd_list =NULL ; -g_slist_free_full (eir->sd_list, sd_free); +slist_clear (eir->sd_list, sd_free); eir->sd_list =NULL ; -g_slist_free_full (eir->data_list, data_free); +slist_clear (eir->data_list, data_free); eir->data_list =NULL ; }
@@ -80,7 +80,7 @@ static void eir_parse_uuid16(struct eir_data *eir, const void *data, uuid_str =bt_uuid2string (&service);if (!uuid_str)continue ; - eir->services =g_slist_append (eir->services, uuid_str); + eir->services =slist_append (eir->services, uuid_str); } }
@@ -99,7 +99,7 @@ static void eir_parse_uuid32(struct eir_data *eir, const void *data, uuid_str =bt_uuid2string (&service);if (!uuid_str)continue ; - eir->services =g_slist_append (eir->services, uuid_str); + eir->services =slist_append (eir->services, uuid_str); } }
@@ -119,7 +119,7 @@ static void eir_parse_uuid128(struct eir_data *eir, const uint8_t *data, uuid_str =bt_uuid2string (&service);if (!uuid_str)continue ; - eir->services =g_slist_append (eir->services, uuid_str); + eir->services =slist_append (eir->services, uuid_str); uuid_ptr +=16 ; } }
@@ -151,7 +151,7 @@ static void eir_parse_msd(struct eir_data *eir, const uint8_t *data, msd->data_len = len -2 ;memcpy (&msd->data, data +2 , msd->data_len); - eir->msd_list =g_slist_append (eir->msd_list, msd); + eir->msd_list =slist_append (eir->msd_list, msd); } static void eir_parse_sd(struct eir_data *eir, uuid_t *service,
@@ -169,7 +169,7 @@ static void eir_parse_sd(struct eir_data *eir, uuid_t *service, sd->data_len = len;memcpy (&sd->data, data, sd->data_len); - eir->sd_list =g_slist_append (eir->sd_list, sd); + eir->sd_list =slist_append (eir->sd_list, sd); } static void eir_parse_uuid16_data(struct eir_data *eir, const uint8_t *data,
@@ -226,7 +226,7 @@ static void eir_parse_data(struct eir_data *eir, uint8_t type, ad->data =g_malloc (len);memcpy (ad->data, data, len); - eir->data_list =g_slist_append (eir->data_list, ad); + eir->data_list =slist_append (eir->data_list, ad);if (type ==EIR_CSIP_RSI ) eir->rsi = true;
@@ -605,12 +605,12 @@ static int match_sd_uuid(const void *data, const void *user_data)struct eir_sd *eir_get_service_data (struct eir_data *eir,const char *uuid) { -GSList *l; +slist_t *l;if (!eir || !uuid)return NULL ; - l =g_slist_find_custom (eir->sd_list, uuid, match_sd_uuid); + l =slist_find (eir->sd_list, uuid, match_sd_uuid);if (!l)return NULL ;
src/eir.h +5 -6
@@ -9,10 +9,9 @@* */ -#include <glib.h> -#include "bluetooth/sdp.h" #include "bluetooth/uuid.h" +#include "src/shared/list.h" #define EIR_FLAGS 0x01/* flags */ #define EIR_UUID16_SOME 0x02/* 16-bit UUID, more available */
@@ -73,7 +72,7 @@ struct eir_ad { };struct eir_data { -GSList *services; +slist_t *services;unsigned int flags;char *name;uint32_t class;
@@ -88,9 +87,9 @@ struct eir_data {uint16_t did_product;uint16_t did_version;uint16_t did_source; -GSList *msd_list; -GSList *sd_list; -GSList *data_list; +slist_t *msd_list; +slist_t *sd_list; +slist_t *data_list; };void eir_data_free (struct eir_data *eir);
unit/test-eir.c +2 -3
@@ -587,7 +587,7 @@ static void print_debug(const char *str, void *user_data)static void test_ad (const struct test_data *test,struct eir_data *eir) {struct bt_ad *ad; -GSList *list; +slist_t *list; ad =bt_ad_new_with_data (test->eir_size, test->eir_data);g_assert (ad);
@@ -636,7 +636,7 @@ static void test_parsing(gconstpointer data) {const struct test_data *test = data;struct eir_data eir; -GSList *list; +slist_t *list;memset (&eir,0 ,sizeof (eir));
@@ -664,7 +664,6 @@ static void test_parsing(gconstpointer data)g_assert (eir.tx_power == test->tx_power);if (test->uuid) { -GSList *list;int n =0 ;for (list = eir.services; list; list = list->next, n++) {
Signature · 1 line
2.53.0
Luiz Augusto von Dentz
maintainerRe: [PATCH BlueZ 2/3] shared: Remove glib dependency from src/shared/ad.c
Hi Bastien,
Quoted 20 lines · Bastien Nocera
src/shared/ad.cincludessrc/eir.h, which uses glib, which means that the non-glib shared library can't be used without linking to glib.Use our own linked list implementation to remove the glib use.
--- plugins/neard.c | 4 ++-- src/adapter.c | 9 +++++---- src/device.c | 22 +++++++++++----------- src/device.h | 10 ++++++---- src/eir.c | 24 ++++++++++++------------ src/eir.h | 11 +++++------ unit/test-eir.c | 5 ++--- 7 files changed, 43 insertions(+), 42 deletions(-)plugins/neard.c +0
-0
plugins/neard.c struct oob_params { · line 61
Quoted 5 lines
plugins/neard.c +1
-1@@ -58,7 +58,7 @@ struct oob_params {bdaddr_t address;uint32_t class;char *name; -GSList *services; +slist_t *services;
No need to come up with another list implementation, just use struct queue.
Quoted 337 lines
plugins/neard.c +1
-1uint8_t *hash;uint8_t *randomizer;uint8_t *pin;@@ -68,7 +68,7 @@ struct oob_params {static void free_oob_params (struct oob_params *params) { -g_slist_free_full (params->services, free); +slist_clear (params->services, free);g_free (params->name);g_free (params->hash);g_free (params->randomizer);src/adapter.c +5
-4@@ -43,6 +43,7 @@#include "textfile.h" #include "src/shared/util.h" +#include "src/shared/list.h" #include "src/shared/queue.h" #include "src/shared/att.h" #include "src/shared/gatt-db.h" @@ -7171,10 +7172,10 @@ static void confirm_name(struct btd_adapter *adapter, const bdaddr_t *bdaddr,static void adapter_msd_notify (struct btd_adapter *adapter,struct btd_device *dev, -GSList *msd_list) +slist_t *msd_list) {GSList *cb_l, *cb_next; -GSList *msd_l, *msd_next; +slist_t *msd_l, *msd_next;for (cb_l = adapter->msd_callbacks; cb_l !=NULL ; cb_l = cb_next) {btd_msd_cb_t cb = cb_l->data;@@ -7184,7 +7185,7 @@ static void adapter_msd_notify(struct btd_adapter *adapter,for (msd_l = msd_list; msd_l !=NULL ; msd_l = msd_next) {const struct eir_msd *msd = msd_l->data; - msd_next =g_slist_next (msd_l); + msd_next = msd_l->next;cb (adapter, dev, msd->company, msd->data, msd->data_len);@@ -7223,7 +7224,7 @@ static bool is_filter_match(GSList *discovery_filter, struct eir_data *eir_data,/* m->data contains string representation of * uuid. */ -if (g_slist_find_custom (eir_data->services, +if (slist_find (eir_data->services, m->data, g_strcmp) !=NULL ) got_match = true;src/device.c +11
-11@@ -2432,9 +2432,9 @@ unref: dev->connect =NULL ; } -void device_add_eir_uuids (struct btd_device *dev,GSList *uuids) +void device_add_eir_uuids (struct btd_device *dev,slist_t *uuids) { -GSList *l; +slist_t *l;GSList *added =NULL ;if (dev->bredr_state.svc_resolved || dev->le_state.svc_resolved)@@ -2465,13 +2465,13 @@ static void add_manufacturer_data(void *data, void *user_data) DEVICE_INTERFACE, "ManufacturerData"); } -void device_set_manufacturer_data (struct btd_device *dev,GSList *list, +void device_set_manufacturer_data (struct btd_device *dev,slist_t *list,bool duplicate) {if (duplicate)bt_ad_clear_manufacturer_data (dev->ad); -g_slist_foreach (list, add_manufacturer_data, dev); +slist_foreach (list, add_manufacturer_data, dev); }static void add_service_data (void *data,void *user_data)@@ -2479,7 +2479,7 @@ static void add_service_data(void *data, void *user_data)struct eir_sd *sd = data;struct btd_device *dev = user_data;bt_uuid_t uuid; -GSList *l; +slist_t *l;if (bt_string_to_uuid (&uuid, sd->uuid) <0 )return ;@@ -2487,21 +2487,21 @@ static void add_service_data(void *data, void *user_data)if (!bt_ad_add_service_data (dev->ad, &uuid, sd->data, sd->data_len))return ; - l =g_slist_append (NULL , sd->uuid); + l =slist_append (NULL , sd->uuid);device_add_eir_uuids (dev, l); -g_slist_free (l); +slist_free (l);g_dbus_emit_property_changed (dbus_conn, dev->path,DEVICE_INTERFACE ,"ServiceData" ); } -void device_set_service_data (struct btd_device *dev,GSList *list, +void device_set_service_data (struct btd_device *dev,slist_t *list,bool duplicate) {if (duplicate)bt_ad_clear_service_data (dev->ad); -g_slist_foreach (list, add_service_data, dev); +slist_foreach (list, add_service_data, dev); }static void add_data (void *data,void *user_data)@@ -2518,13 +2518,13 @@ static void add_data(void *data, void *user_data) "AdvertisingData"); } -void device_set_data (struct btd_device *dev,GSList *list, +void device_set_data (struct btd_device *dev,slist_t *list,bool duplicate) {if (duplicate)bt_ad_clear_data (dev->ad); -g_slist_foreach (list, add_data, dev); +slist_foreach (list, add_data, dev); } static struct btd_service *find_connectable_service(struct btd_device *dev,src/device.h +6
-4@@ -9,6 +9,8 @@* */ +#include "src/shared/list.h" +#define DEVICE_INTERFACE "org.bluez.Device1"struct btd_device ;@@ -78,12 +80,12 @@ void btd_device_gatt_set_service_changed(struct btd_device *device, uint16_t start, uint16_t end);bool device_attach_att (struct btd_device *dev,GIOChannel *io);void btd_device_add_uuid (struct btd_device *device,const char *uuid); -void device_add_eir_uuids (struct btd_device *dev,GSList *uuids); -void device_set_manufacturer_data (struct btd_device *dev,GSList *list, +void device_add_eir_uuids (struct btd_device *dev,slist_t *uuids); +void device_set_manufacturer_data (struct btd_device *dev,slist_t *list,bool duplicate); -void device_set_service_data (struct btd_device *dev,GSList *list, +void device_set_service_data (struct btd_device *dev,slist_t *list,bool duplicate); -void device_set_data (struct btd_device *dev,GSList *list, +void device_set_data (struct btd_device *dev,slist_t *list,bool duplicate);void device_probe_profile (gpointer a,gpointer b);void device_remove_profile (gpointer a,gpointer b);src/eir.c +12
-12@@ -49,7 +49,7 @@ static void data_free(void *data)void eir_data_free (struct eir_data *eir) { -g_slist_free_full (eir->services, free); +slist_clear (eir->services, free); eir->services =NULL ;g_free (eir->name); eir->name =NULL ;@@ -57,11 +57,11 @@ void eir_data_free(struct eir_data *eir) eir->hash =NULL ;free (eir->randomizer); eir->randomizer =NULL ; -g_slist_free_full (eir->msd_list, g_free); +slist_clear (eir->msd_list, g_free); eir->msd_list =NULL ; -g_slist_free_full (eir->sd_list, sd_free); +slist_clear (eir->sd_list, sd_free); eir->sd_list =NULL ; -g_slist_free_full (eir->data_list, data_free); +slist_clear (eir->data_list, data_free); eir->data_list =NULL ; }@@ -80,7 +80,7 @@ static void eir_parse_uuid16(struct eir_data *eir, const void *data, uuid_str =bt_uuid2string (&service);if (!uuid_str)continue ; - eir->services =g_slist_append (eir->services, uuid_str); + eir->services =slist_append (eir->services, uuid_str); } }@@ -99,7 +99,7 @@ static void eir_parse_uuid32(struct eir_data *eir, const void *data, uuid_str =bt_uuid2string (&service);if (!uuid_str)continue ; - eir->services =g_slist_append (eir->services, uuid_str); + eir->services =slist_append (eir->services, uuid_str); } }@@ -119,7 +119,7 @@ static void eir_parse_uuid128(struct eir_data *eir, const uint8_t *data, uuid_str =bt_uuid2string (&service);if (!uuid_str)continue ; - eir->services =g_slist_append (eir->services, uuid_str); + eir->services =slist_append (eir->services, uuid_str); uuid_ptr +=16 ; } }@@ -151,7 +151,7 @@ static void eir_parse_msd(struct eir_data *eir, const uint8_t *data, msd->data_len = len -2 ;memcpy (&msd->data, data +2 , msd->data_len); - eir->msd_list =g_slist_append (eir->msd_list, msd); + eir->msd_list =slist_append (eir->msd_list, msd); } static void eir_parse_sd(struct eir_data *eir, uuid_t *service,@@ -169,7 +169,7 @@ static void eir_parse_sd(struct eir_data *eir, uuid_t *service, sd->data_len = len;memcpy (&sd->data, data, sd->data_len); - eir->sd_list =g_slist_append (eir->sd_list, sd); + eir->sd_list =slist_append (eir->sd_list, sd); } static void eir_parse_uuid16_data(struct eir_data *eir, const uint8_t *data,@@ -226,7 +226,7 @@ static void eir_parse_data(struct eir_data *eir, uint8_t type, ad->data =g_malloc (len);memcpy (ad->data, data, len); - eir->data_list =g_slist_append (eir->data_list, ad); + eir->data_list =slist_append (eir->data_list, ad);if (type ==EIR_CSIP_RSI ) eir->rsi = true;@@ -605,12 +605,12 @@ static int match_sd_uuid(const void *data, const void *user_data)struct eir_sd *eir_get_service_data (struct eir_data *eir,const char *uuid) { -GSList *l; +slist_t *l;if (!eir || !uuid)return NULL ; - l =g_slist_find_custom (eir->sd_list, uuid, match_sd_uuid); + l =slist_find (eir->sd_list, uuid, match_sd_uuid);if (!l)return NULL ;src/eir.h +5
-6@@ -9,10 +9,9 @@* */ -#include <glib.h> -#include "bluetooth/sdp.h" #include "bluetooth/uuid.h" +#include "src/shared/list.h" #define EIR_FLAGS 0x01/* flags */ #define EIR_UUID16_SOME 0x02/* 16-bit UUID, more available */ @@ -73,7 +72,7 @@ struct eir_ad { };struct eir_data { -GSList *services; +slist_t *services;unsigned int flags;char *name;uint32_t class;@@ -88,9 +87,9 @@ struct eir_data {uint16_t did_product;uint16_t did_version;uint16_t did_source; -GSList *msd_list; -GSList *sd_list; -GSList *data_list; +slist_t *msd_list; +slist_t *sd_list; +slist_t *data_list; };void eir_data_free (struct eir_data *eir);unit/test-eir.c +2
-4@@ -587,7 +587,7 @@ static void print_debug(const char *str, void *user_data)static void test_ad (const struct test_data *test,struct eir_data *eir) {struct bt_ad *ad; -GSList *list; +slist_t *list; ad =bt_ad_new_with_data (test->eir_size, test->eir_data);g_assert (ad);@@ -636,7 +636,7 @@ static void test_parsing(gconstpointer data) {const struct test_data *test = data;struct eir_data eir; -GSList *list; +slist_t *list;memset (&eir,0 ,sizeof (eir));@@ -664,7 +664,6 @@ static void test_parsing(gconstpointer data)g_assert (eir.tx_power == test->tx_power);if (test->uuid) { -GSList *list;int n =0 ;for (list = eir.services; list; list = list->next, n++) { --2.53.0
Signature · 1 line
Luiz Augusto von Dentz
Re: [PATCH BlueZ 2/3] shared: Remove glib dependency from src/shared/ad.c
Quoted 20 lines · Luiz Augusto von Dentz
Hi Bastien,
Quoted 16 lines · Bastien Nocera
src/shared/ad.cincludessrc/eir.h, which uses glib, which means that
the non-glib shared library can't be used without linking to glib.Use our own linked list implementation to remove the glib use.
---
plugins/neard.c | 4 ++--
src/adapter.c | 9 +++++----
src/device.c | 22 +++++++++++----------- src/device.h | 10 ++++++----
src/eir.c | 24 ++++++++++++------------ src/eir.h | 11 +++++------
unit/test-eir.c | 5 ++---7 files changed, 43 insertions(+), 42 deletions(-)
Quoted 13 lines
plugins/neard.c struct oob_params { · line 61
Quoted 10 lines
plugins/neard.c +1
-1@@ -58,7 +58,7 @@ struct oob_params { bdaddr_t address; uint32_t class; char *name; - GSList *services; + slist_t *services;No need to come up with another list implementation, just use struct queue.
It's not a linked list if you can't access the links...
I'm adding "document our own data types" to the documentation TODO.
Quoted 394 lines
Quoted 393 lines
plugins/neard.c +1
-1uint8_t *hash; uint8_t *randomizer; uint8_t *pin;@@ -68,7 +68,7 @@ struct oob_params { static void free_oob_params(struct oob_params *params) { - g_slist_free_full(params->services, free); + slist_clear(params->services, free); g_free(params->name); g_free(params->hash); g_free(params->randomizer);src/adapter.c +1
-0@@ -43,6 +43,7 @@ #include "textfile.h" #include "src/shared/util.h" +#include "src/shared/list.h" #include "src/shared/queue.h" #include "src/shared/att.h" #include "src/shared/gatt-db.h"@@ -7171,10 +7172,10 @@ static void confirm_name(struct btd_adapter *adapter, const bdaddr_t *bdaddr, static void adapter_msd_notify(struct btd_adapter *adapter,struct
btd_device*dev,
- GSList*msd_list)
+slist_t*msd_list)
{
GSList*cb_l,*cb_next;
- GSList*msd_l,*msd_next;
+slist_t*msd_l,*msd_next;for (
cb_l=adapter->msd_callbacks;cb_l!= NULL;cb_l=cb_next) {
btd_msd_cb_tcb =cb_l->data;src/adapter.c +0
-0@@ -7184,7 +7185,7 @@ static void adapter_msd_notify(struct btd_adapter *adapter,for (
msd_l=msd_list;msd_l!= NULL;msd_l=msd_next) {
const structeir_msd*msd =msd_l->data;-
msd_next=g_slist_next(msd_l); +msd_next=msd_l->next;cb(adapter, dev,
msd->company,msd->data,msd->data_len);src/adapter.c +0
-0@@ -7223,7 +7224,7 @@ static bool is_filter_match(GSList *discovery_filter, struct eir_data *eir_data, /* m->data contains stringrepresentation of
* uuid.
*/
- if (g_slist_find_custom(eir_data-Quoted 1 line
services,
+ if (
slist_find(eir_data->services, m->data, g_strcmp)!= NULL)
got_match= true;src/device.c +2
-2@@ -2432,9 +2432,9 @@ unref: dev->connect = NULL; } -void device_add_eir_uuids (struct btd_device *dev,GSList *uuids) +void device_add_eir_uuids (struct btd_device *dev,slist_t *uuids) { - GSList *l; + slist_t *l; GSList *added = NULL;if (
dev->bredr_state.svc_resolved|| dev-Quoted 1 line
le_state.svc_resolved)
src/device.c +1
-1@@ -2465,13 +2465,13 @@ static void add_manufacturer_data(void *data, void *user_data) DEVICE_INTERFACE, "ManufacturerData"); } -void device_set_manufacturer_data(struct btd_device *dev, GSList *list, +void device_set_manufacturer_data(struct btd_device *dev, slist_t *list,
bool duplicate)
{
if (duplicate)bt_ad_clear_manufacturer_data(dev->ad);-
g_slist_foreach(list, add_manufacturer_data, dev); +slist_foreach(list, add_manufacturer_data, dev); }static void
add_service_data(void *data, void *user_data)src/device.c +1
-1@@ -2479,7 +2479,7 @@ static void add_service_data(void *data, void *user_data) struct eir_sd *sd = data; struct btd_device *dev = user_data; bt_uuid_t uuid; - GSList *l; + slist_t *l; if (bt_string_to_uuid(&uuid, sd->uuid) < 0)return;
src/device.c +0
-0@@ -2487,21 +2487,21 @@ static void add_service_data(void *data, void *user_data)if (!bt_ad_add_service_data(dev->ad, &uuid,
sd->data, sd-Quoted 1 line
data_len))return;
- l =
g_slist_append(NULL, sd->uuid);
+ l =slist_append(NULL, sd->uuid);
device_add_eir_uuids(dev, l);
-g_slist_free(l);
+slist_free(l);
g_dbus_emit_property_changed(dbus_conn, dev->path, DEVICE_INTERFACE, "ServiceData");
}src/device.c +1
-1-void device_set_service_data(struct btd_device *dev, GSList *list, +void device_set_service_data(struct btd_device *dev, slist_t*list,
bool duplicate)
{
if (duplicate)bt_ad_clear_service_data(dev->ad);-
g_slist_foreach(list, add_service_data, dev); +slist_foreach(list, add_service_data, dev); }static void
add_data(void *data, void *user_data)src/device.c +1
-1@@ -2518,13 +2518,13 @@ static void add_data(void *data, void *user_data) "AdvertisingData"); } -void device_set_data(struct btd_device *dev, GSList *list, +void device_set_data(struct btd_device *dev, slist_t *list,bool duplicate)
{
if (duplicate)
bt_ad_clear_data(dev->ad);-
g_slist_foreach(list, add_data, dev);
+slist_foreach(list, add_data, dev);
}static struct
btd_service*find_connectable_service(structbtd_device*dev,src/device.h +2
-0@@ -9,6 +9,8 @@* */ +#include "src/shared/list.h" + #define DEVICE_INTERFACE "org.bluez.Device1" struct btd_device;@@ -78,12 +80,12 @@ void btd_device_gatt_set_service_changed(structbtd_device *device, uint16_t start, uint16_t end); bool device_attach_att(struct btd_device *dev, GIOChannel *io);void
btd_device_add_uuid(struct btd_device *device, const char *uuid);src/device.h +0
-2-void device_add_eir_uuids (struct btd_device *dev,GSList *uuids); -void device_set_manufacturer_data(struct btd_device *dev, GSList*list,
src/device.h +2
-0+void device_add_eir_uuids (struct btd_device *dev,slist_t *uuids); +void device_set_manufacturer_data(struct btd_device *dev, slist_t*list,
bool duplicate);src/device.h +1
-1-void device_set_service_data(struct btd_device *dev, GSList *list, +void device_set_service_data(struct btd_device *dev, slist_t*list,
bool duplicate);src/device.h +1
-1-void device_set_data(struct btd_device *dev, GSList *list, +void device_set_data(struct btd_device *dev, slist_t *list,bool duplicate);
voiddevice_probe_profile(gpointer a, gpointer b); voiddevice_remove_profile(gpointer a, gpointer b);src/eir.c +5
-5@@ -49,7 +49,7 @@ static void data_free(void *data) void eir_data_free(struct eir_data *eir) { - g_slist_free_full(eir->services, free); + slist_clear(eir->services, free); eir->services = NULL; g_free(eir->name); eir->name = NULL;@@ -57,11 +57,11 @@ void eir_data_free(struct eir_data *eir) eir->hash = NULL; free(eir->randomizer); eir->randomizer = NULL; - g_slist_free_full(eir->msd_list, g_free); + slist_clear(eir->msd_list, g_free); eir->msd_list = NULL; - g_slist_free_full(eir->sd_list, sd_free); + slist_clear(eir->sd_list, sd_free); eir->sd_list = NULL; - g_slist_free_full(eir->data_list, data_free); + slist_clear(eir->data_list, data_free); eir->data_list = NULL; }@@ -80,7 +80,7 @@ static void eir_parse_uuid16(struct eir_data *eir, const void *data, uuid_str = bt_uuid2string(&service); if (!uuid_str) continue; - eir->services = g_slist_append(eir->services, uuid_str); + eir->services = slist_append(eir->services, uuid_str);}
}src/eir.c +1
-1@@ -99,7 +99,7 @@ static void eir_parse_uuid32(struct eir_data *eir, const void *data, uuid_str = bt_uuid2string(&service); if (!uuid_str) continue; - eir->services = g_slist_append(eir->services, uuid_str); + eir->services = slist_append(eir->services, uuid_str);}
}src/eir.c +1
-1@@ -119,7 +119,7 @@ static void eir_parse_uuid128(struct eir_data *eir, const uint8_t *data, uuid_str = bt_uuid2string(&service); if (!uuid_str) continue; - eir->services = g_slist_append(eir->services, uuid_str); + eir->services = slist_append(eir->services, uuid_str);
uuid_ptr+= 16;
}
}src/eir.c +1
-1@@ -151,7 +151,7 @@ static void eir_parse_msd(struct eir_data *eir,const uint8_t *data, msd->data_len = len - 2; memcpy(&msd->data, data + 2, msd->data_len); - eir->msd_list = g_slist_append(eir->msd_list, msd); + eir->msd_list = slist_append(eir->msd_list, msd); }static void eir_parse_sd(struct
eir_data*eir,uuid_t*service,src/eir.c +1
-1@@ -169,7 +169,7 @@ static void eir_parse_sd(struct eir_data *eir,uuid_t *service, sd->data_len = len; memcpy(&sd->data, data, sd->data_len); - eir->sd_list = g_slist_append(eir->sd_list, sd); + eir->sd_list = slist_append(eir->sd_list, sd); }static void eir_parse_uuid16_data(struct
eir_data*eir, constuint8_t*data,src/eir.c +1
-1@@ -226,7 +226,7 @@ static void eir_parse_data(struct eir_data *eir, uint8_t type, ad->data = g_malloc(len); memcpy(ad->data, data, len); - eir->data_list = g_slist_append(eir->data_list, ad); + eir->data_list = slist_append(eir->data_list, ad); if (type == EIR_CSIP_RSI)
eir->rsi= true;src/eir.c +0
-0@@ -605,12 +605,12 @@ static int match_sd_uuid(const void *data, const void *user_data)struct
eir_sd*eir_get_service_data(structeir_data*eir, const char *uuid)
{
- GSList *l;
+slist_t*l;if (!eir || !uuid)
return NULL;- l =
g_slist_find_custom(eir->sd_list, uuid, match_sd_uuid); + l =slist_find(eir->sd_list, uuid, match_sd_uuid); if (!l)
return NULL;src/eir.h +1
-2@@ -9,10 +9,9 @@* */ -#include <glib.h> - #include "bluetooth/sdp.h" #include "bluetooth/uuid.h" +#include "src/shared/list.h" #define EIR_FLAGS 0x01 /* flags */ #define EIR_UUID16_SOME 0x02 /* 16-bit UUID, moreavailable */
src/eir.h +4
-4@@ -73,7 +72,7 @@ struct eir_ad { }; struct eir_data { - GSList *services; + slist_t *services; unsigned int flags; char *name; uint32_t class;@@ -88,9 +87,9 @@ struct eir_data { uint16_t did_product; uint16_t did_version; uint16_t did_source; - GSList *msd_list; - GSList *sd_list; - GSList *data_list; + slist_t *msd_list; + slist_t *sd_list; + slist_t *data_list; }; void eir_data_free(struct eir_data *eir);unit/test-eir.c +0
-0@@ -587,7 +587,7 @@ static void print_debug(const char *str, void *user_data)static void
test_ad(const struct test_data *test, struct eir_data *eir)
{
structbt_ad*ad;
- GSList *list;
+slist_t*list;ad =
bt_ad_new_with_data(test->eir_size, test->eir_data);g_assert(ad);unit/test-eir.c +1
-2@@ -636,7 +636,7 @@ static void test_parsing(gconstpointer data) { const struct test_data *test = data; struct eir_data eir; - GSList *list; + slist_t *list; memset(&eir, 0, sizeof(eir));@@ -664,7 +664,6 @@ static void test_parsing(gconstpointer data) g_assert(eir.tx_power == test->tx_power); if (test->uuid) { - GSList *list; int n = 0; for (list = eir.services; list; list = list->next,n++) {
--
2.53.0
PATCH 3/3 shared: Remove unneeded glib includes
In reply to Bastien Noceraglib was included, but no glib functions or data types were being used, so remove those includes.
--- src/shared/csip.c | 2 -- src/shared/rap.c | 1 - 2 files changed, 3 deletions(-)
src/shared/csip.c +0 -2
@@ -15,8 +15,6 @@#include <unistd.h> #include <errno.h> -#include <glib.h> -#include "bluetooth/bluetooth.h" #include "bluetooth/uuid.h"
src/shared/rap.c +0 -1
@@ -12,7 +12,6 @@#include <stdbool.h> #include <unistd.h> #include <errno.h> -#include <glib.h> #include "bluetooth/bluetooth.h" #include "bluetooth/uuid.h"
Signature · 1 line
2.53.0
This is an automated email and please do not reply to this email.
Dear Submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
While preparing the CI tests, the patches you submitted couldn't be applied to the current HEAD of the repository.
----- Output -----
error: patch failed: Makefile.am:700
error: Makefile.am: patch does not apply
hint: Use 'git am --show-current-patch' to see the failed patch
Please resolve the issue and submit the patches again.
---
Regards,
Linux Bluetooth