From ac5178859b173fabf71cf08bb864e12cab6561e9 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Mon, 7 Nov 2011 11:16:20 -0300 Subject: [PATCH] Fix removing storage for device over BR/EDR "characteristic", "attributes" and "ccc" files will be shared by both transports: LE and BR/EDR. Remove the entry from the "primary" file should be the last operation to clean the storage properly if the device operation mode is GATT/ATT over BR/EDR. --- src/storage.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/storage.c b/src/storage.c index e4ad4abc8..a47720a41 100644 --- a/src/storage.c +++ b/src/storage.c @@ -1170,17 +1170,10 @@ done: int delete_device_service(const bdaddr_t *sba, const bdaddr_t *dba) { char filename[PATH_MAX + 1], address[18]; - int err; - - create_filename(filename, PATH_MAX, sba, "primary"); memset(address, 0, sizeof(address)); ba2str(dba, address); - err = textfile_del(filename, address); - if (err < 0) - return err; - /* Deleting all characteristics of a given address */ create_filename(filename, PATH_MAX, sba, "characteristic"); delete_by_pattern(filename, address); @@ -1193,7 +1186,8 @@ int delete_device_service(const bdaddr_t *sba, const bdaddr_t *dba) create_filename(filename, PATH_MAX, sba, "ccc"); delete_by_pattern(filename, address); - return 0; + create_filename(filename, PATH_MAX, sba, "primary"); + return textfile_del(filename, address); } char *read_device_services(const bdaddr_t *sba, const bdaddr_t *dba) -- 2.47.3