Bluetooth: Setting: Make bt_settings_encode_key take a const address
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:
parent
4edfd45c6d
commit
bd5048c251
3 changed files with 9 additions and 11 deletions
|
@ -4137,11 +4137,9 @@ int bt_gatt_store_ccc(u8_t id, const bt_addr_le_t *addr)
|
|||
char id_str[4];
|
||||
|
||||
u8_to_dec(id_str, sizeof(id_str), id);
|
||||
bt_settings_encode_key(key, sizeof(key), "ccc",
|
||||
(bt_addr_le_t *)addr, id_str);
|
||||
bt_settings_encode_key(key, sizeof(key), "ccc", addr, id_str);
|
||||
} else {
|
||||
bt_settings_encode_key(key, sizeof(key), "ccc",
|
||||
(bt_addr_le_t *)addr, NULL);
|
||||
bt_settings_encode_key(key, sizeof(key), "ccc", addr, NULL);
|
||||
}
|
||||
|
||||
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);
|
||||
bt_settings_encode_key(key, sizeof(key), "ccc",
|
||||
(bt_addr_le_t *)addr, id_str);
|
||||
addr, id_str);
|
||||
} else {
|
||||
bt_settings_encode_key(key, sizeof(key), "ccc",
|
||||
(bt_addr_le_t *)addr, NULL);
|
||||
addr, NULL);
|
||||
}
|
||||
|
||||
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);
|
||||
bt_settings_encode_key(key, sizeof(key), "cf",
|
||||
(bt_addr_le_t *)addr, id_str);
|
||||
addr, id_str);
|
||||
} else {
|
||||
bt_settings_encode_key(key, sizeof(key), "cf",
|
||||
(bt_addr_le_t *)addr, NULL);
|
||||
addr, NULL);
|
||||
}
|
||||
|
||||
return settings_delete(key);
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#if defined(CONFIG_BT_SETTINGS_USE_PRINTK)
|
||||
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) {
|
||||
snprintk(path, path_size,
|
||||
|
@ -41,7 +41,7 @@ void bt_settings_encode_key(char *path, size_t path_size, const char *subsys,
|
|||
}
|
||||
#else
|
||||
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;
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
/* Helpers for keys containing a bdaddr */
|
||||
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);
|
||||
|
||||
void bt_settings_save_id(void);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue