diff options
| author | Szymon Janc <szymon.janc@tieto.com> | 2013-12-09 11:11:33 +0100 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2013-12-10 07:30:47 +0200 |
| commit | 685af9990800418633dee0259f0a9c2a77a7ede6 (patch) | |
| tree | 4b05b9a5c0ce2b9b3d08edef264f40dd0e3774f3 /src | |
| parent | cbdeaef9d5486f38564d46934a9924a906cc93c7 (diff) | |
core: Remove not needed struct adapter_keys
This is a leftover from using old storage format.
Diffstat (limited to 'src')
| -rw-r--r-- | src/adapter.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/adapter.c b/src/adapter.c index 41f7bd605..8ec9e9204 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -2196,11 +2196,6 @@ static const GDBusPropertyTable adapter_properties[] = { { } }; -struct adapter_keys { - struct btd_adapter *adapter; - GSList *keys; -}; - static int str2buf(const char *str, uint8_t *buf, size_t blen) { int i, dlen; @@ -2479,8 +2474,8 @@ static void load_devices(struct btd_adapter *adapter) { char filename[PATH_MAX + 1]; char srcaddr[18]; - struct adapter_keys keys = { adapter, NULL }; - struct adapter_keys ltks = { adapter, NULL }; + GSList *keys = NULL; + GSList *ltks = NULL; DIR *dir; struct dirent *entry; @@ -2514,11 +2509,11 @@ static void load_devices(struct btd_adapter *adapter) key_info = get_key_info(key_file, entry->d_name); if (key_info) - keys.keys = g_slist_append(keys.keys, key_info); + keys = g_slist_append(keys, key_info); ltk_info = get_ltk_info(key_file, entry->d_name); if (ltk_info) - ltks.keys = g_slist_append(ltks.keys, ltk_info); + ltks = g_slist_append(ltks, ltk_info); list = g_slist_find_custom(adapter->devices, entry->d_name, device_address_cmp); @@ -2553,11 +2548,11 @@ free: closedir(dir); - load_link_keys(adapter, keys.keys, main_opts.debug_keys); - g_slist_free_full(keys.keys, g_free); + load_link_keys(adapter, keys, main_opts.debug_keys); + g_slist_free_full(keys, g_free); - load_ltks(adapter, ltks.keys); - g_slist_free_full(ltks.keys, g_free); + load_ltks(adapter, ltks); + g_slist_free_full(ltks, g_free); } int btd_adapter_block_address(struct btd_adapter *adapter, |