diff options
author | Frédéric Danis <frederic.danis@linux.intel.com> | 2012-12-13 21:39:24 +0100 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-12-13 22:57:33 +0200 |
commit | bc28289e98ac548bf695a3c2e186826422a9d6f0 (patch) | |
tree | d5c57bc2cd0b8343004f88e6d14a22b1f79613eb /src/storage.c | |
parent | ad8c99b813442753426a4f0bd636f90fcbfe5b01 (diff) | |
download | bluez-bc28289e98ac548bf695a3c2e186826422a9d6f0.tar.gz |
device: Remove stored SDP records on device removal
Also remove management of legacy storage file in device_remove_stored().
Remove no more used storage functions.
Diffstat (limited to 'src/storage.c')
-rw-r--r-- | src/storage.c | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/src/storage.c b/src/storage.c index 74b19c09a..d4516ed5d 100644 --- a/src/storage.c +++ b/src/storage.c @@ -245,31 +245,6 @@ ssize_t read_pin_code(const bdaddr_t *local, const bdaddr_t *peer, char *pin) return len; } -int delete_entry(const bdaddr_t *src, const char *storage, const bdaddr_t *dst, - uint8_t dst_type) -{ - char filename[PATH_MAX + 1], key[20]; - int err, ret; - - ba2str(dst, key); - sprintf(&key[17], "#%hhu", dst_type); - - create_filename(filename, PATH_MAX, src, storage); - - err = 0; - ret = textfile_del(filename, key); - if (ret) - err = ret; - - /* Trying without address type */ - key[17] = '\0'; - ret = textfile_del(filename, key); - if (ret) - err = ret; - - return err; -} - int store_record(const gchar *src, const gchar *dst, uint8_t dst_type, sdp_record_t *rec) { @@ -397,26 +372,6 @@ static void create_stored_records_from_keys(char *key, char *value, rec_list->recs = sdp_list_append(rec_list->recs, rec); } -void delete_all_records(const bdaddr_t *src, const bdaddr_t *dst, - uint8_t dst_type) -{ - sdp_list_t *records, *seq; - char srcaddr[18], dstaddr[18]; - - ba2str(src, srcaddr); - ba2str(dst, dstaddr); - - records = read_records(src, dst); - - for (seq = records; seq; seq = seq->next) { - sdp_record_t *rec = seq->data; - delete_record(srcaddr, dstaddr, dst_type, rec->handle); - } - - if (records) - sdp_list_free(records, (sdp_free_func_t) sdp_record_free); -} - sdp_list_t *read_records(const bdaddr_t *src, const bdaddr_t *dst) { char filename[PATH_MAX + 1]; @@ -526,33 +481,6 @@ done: g_slist_free_full(match.keys, g_free); } -int delete_device_service(const bdaddr_t *sba, const bdaddr_t *dba, - uint8_t bdaddr_type) -{ - char filename[PATH_MAX + 1], key[20]; - - memset(key, 0, sizeof(key)); - - ba2str(dba, key); - sprintf(&key[17], "#%hhu", bdaddr_type); - - /* Deleting all characteristics of a given key */ - create_filename(filename, PATH_MAX, sba, "characteristics"); - delete_by_pattern(filename, key); - - /* Deleting all attributes values of a given key */ - create_filename(filename, PATH_MAX, sba, "attributes"); - delete_by_pattern(filename, key); - - /* Deleting all CCC values of a given key */ - create_filename(filename, PATH_MAX, sba, "ccc"); - delete_by_pattern(filename, key); - - create_filename(filename, PATH_MAX, sba, "primaries"); - - return textfile_del(filename, key); -} - char *read_device_services(const bdaddr_t *sba, const bdaddr_t *dba, uint8_t bdaddr_type) { |