From: "Frédéric Danis" <frederic.danis@linux.intel.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 2/8] device: Device_remove_stored removes device directory
Date: Thu, 15 Nov 2012 18:31:35 +0100 [thread overview]
Message-ID: <1353000701-16605-2-git-send-email-frederic.danis@linux.intel.com> (raw)
In-Reply-To: <1353000701-16605-1-git-send-email-frederic.danis@linux.intel.com>
When a device is removed we should remove the device info
file and storage directory.
---
src/device.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/src/device.c b/src/device.c
index e3570cb..5969f15 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1873,6 +1873,9 @@ static void device_remove_stored(struct btd_device *device)
{
const bdaddr_t *src = adapter_get_address(device->adapter);
uint8_t dst_type = device->bdaddr_type;
+ char adapter_addr[18];
+ char device_addr[18];
+ char filename[PATH_MAX + 1];
delete_entry(src, "profiles", &device->bdaddr, dst_type);
delete_entry(src, "trusts", &device->bdaddr, dst_type);
@@ -1893,6 +1896,19 @@ static void device_remove_stored(struct btd_device *device)
if (device->blocked)
device_unblock(device, TRUE, FALSE);
+
+ ba2str(src, adapter_addr);
+ ba2str(&device->bdaddr, device_addr);
+
+ snprintf(filename, PATH_MAX, STORAGEDIR "/%s/%s/info", adapter_addr,
+ device_addr);
+ filename[PATH_MAX] = '\0';
+ remove(filename);
+
+ snprintf(filename, PATH_MAX, STORAGEDIR "/%s/%s", adapter_addr,
+ device_addr);
+ filename[PATH_MAX] = '\0';
+ remove(filename);
}
void device_remove(struct btd_device *device, gboolean remove_stored)
--
1.7.9.5
next prev parent reply other threads:[~2012-11-15 17:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-15 17:31 [PATCH 1/8] device: Remove storage path #defines Frédéric Danis
2012-11-15 17:31 ` Frédéric Danis [this message]
2012-11-15 17:31 ` [PATCH 3/8] adapter: Convert storage classes Frédéric Danis
2012-11-15 17:31 ` [PATCH 4/8] device: Retrieve class from storage Frédéric Danis
2012-11-15 17:31 ` [PATCH 5/8] adapter: Set device class in device object Frédéric Danis
2012-11-15 17:31 ` [PATCH 6/8] event: " Frédéric Danis
2012-11-15 17:31 ` [PATCH 7/8] dbusoob: " Frédéric Danis
2012-11-15 17:31 ` [PATCH 8/8] neard: " Frédéric Danis
2012-11-16 8:24 ` Johan Hedberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1353000701-16605-2-git-send-email-frederic.danis@linux.intel.com \
--to=frederic.danis@linux.intel.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).