michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Setting: Make bt_settings_encode_key take a const address

Browse source 
This removes the need to cast in case the address is already const.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Luiz Augusto von Dentz 2020-02-13 11:14:54 -08:00 • committed by Johan Hedberg
commit bd5048c251
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
subsys/bluetooth/host/gatt.c
View file

@ -4137,11 +4137,9 @@ int bt_gatt_store_ccc(u8_t id, const bt_addr_le_t *addr)
char id_str[4]; char id_str[4];
u8_to_dec(id_str, sizeof(id_str), id); u8_to_dec(id_str, sizeof(id_str), id);
bt_settings_encode_key(key, sizeof(key), "ccc", bt_settings_encode_key(key, sizeof(key), "ccc", addr, id_str);
(bt_addr_le_t *)addr, id_str);
} else { } else {
bt_settings_encode_key(key, sizeof(key), "ccc", bt_settings_encode_key(key, sizeof(key), "ccc", addr, NULL);
(bt_addr_le_t *)addr, NULL);
} }
if (save.count) { if (save.count) {
@ -4392,10 +4390,10 @@ static int bt_gatt_clear_ccc(u8_t id, const bt_addr_le_t *addr)
u8_to_dec(id_str, sizeof(id_str), id); u8_to_dec(id_str, sizeof(id_str), id);
bt_settings_encode_key(key, sizeof(key), "ccc", bt_settings_encode_key(key, sizeof(key), "ccc",
(bt_addr_le_t *)addr, id_str); addr, id_str);
} else { } else {
bt_settings_encode_key(key, sizeof(key), "ccc", bt_settings_encode_key(key, sizeof(key), "ccc",
(bt_addr_le_t *)addr, NULL); addr, NULL);
} }
return settings_delete(key); return settings_delete(key);
@ -4421,10 +4419,10 @@ static int bt_gatt_clear_cf(u8_t id, const bt_addr_le_t *addr)
u8_to_dec(id_str, sizeof(id_str), id); u8_to_dec(id_str, sizeof(id_str), id);
bt_settings_encode_key(key, sizeof(key), "cf", bt_settings_encode_key(key, sizeof(key), "cf",
(bt_addr_le_t *)addr, id_str); addr, id_str);
} else { } else {
bt_settings_encode_key(key, sizeof(key), "cf", bt_settings_encode_key(key, sizeof(key), "cf",
(bt_addr_le_t *)addr, NULL); addr, NULL);
} }
return settings_delete(key); return settings_delete(key);

4
subsys/bluetooth/host/settings.c
View file

@ -21,7 +21,7 @@
#if defined(CONFIG_BT_SETTINGS_USE_PRINTK) #if defined(CONFIG_BT_SETTINGS_USE_PRINTK)
void bt_settings_encode_key(char *path, size_t path_size, const char *subsys, void bt_settings_encode_key(char *path, size_t path_size, const char *subsys,
bt_addr_le_t *addr, const char *key) const bt_addr_le_t *addr, const char *key)
{ {
if (key) { if (key) {
snprintk(path, path_size, snprintk(path, path_size,
@ -41,7 +41,7 @@ void bt_settings_encode_key(char *path, size_t path_size, const char *subsys,
} }
#else #else
void bt_settings_encode_key(char *path, size_t path_size, const char *subsys, void bt_settings_encode_key(char *path, size_t path_size, const char *subsys,
bt_addr_le_t *addr, const char *key) const bt_addr_le_t *addr, const char *key)
{ {
size_t len = 3; size_t len = 3;

2
subsys/bluetooth/host/settings.h
View file

@ -12,7 +12,7 @@
/* Helpers for keys containing a bdaddr */ /* Helpers for keys containing a bdaddr */
void bt_settings_encode_key(char *path, size_t path_size, const char *subsys, void bt_settings_encode_key(char *path, size_t path_size, const char *subsys,
bt_addr_le_t *addr, const char *key); const bt_addr_le_t *addr, const char *key);
int bt_settings_decode_key(const char *key, bt_addr_le_t *addr); int bt_settings_decode_key(const char *key, bt_addr_le_t *addr);
void bt_settings_save_id(void); void bt_settings_save_id(void);