Make use of create_name()

4 files changed, 6 insertions, 6 deletions

diff --git a/hcid/storage.c b/hcid/storage.c
index ee927a78..ade97641 100644
--- a/hcid/storage.c
+++ b/hcid/storage.c
@@ -43,13 +43,13 @@
 #include "textfile.h"
 #include "hcid.h"
 
-static int create_filename(char *buf, size_t size, bdaddr_t *bdaddr, char *name)
+static inline int create_filename(char *buf, size_t size, bdaddr_t *bdaddr, const char *name)
 {
 	char addr[18];
 
 	ba2str(bdaddr, addr);
 
-	return snprintf(buf, size, "%s/%s/%s", STORAGEDIR, addr, name);
+	return create_name(buf, size, STORAGEDIR, addr, name);
 }
 
 int write_discoverable_timeout(bdaddr_t *bdaddr, int timeout)
diff --git a/hidd/sdp.c b/hidd/sdp.c
index 2eef3889..2c010f79 100644
--- a/hidd/sdp.c
+++ b/hidd/sdp.c
@@ -76,7 +76,7 @@ static int store_device_info(const bdaddr_t *src, const bdaddr_t *dst, struct hi
 	int i, size;
 
 	ba2str(src, addr);
-	snprintf(filename, PATH_MAX, "%s/%s/hidd", STORAGEDIR, addr);
+	create_name(filename, PATH_MAX, STORAGEDIR, addr, "hidd");
 
 	size = 15 + 3 + 3 + 5 + (req->rd_size * 2) + 1 + 9 + strlen(req->name) + 2;
 	str = malloc(size);
@@ -117,7 +117,7 @@ int get_stored_device_info(const bdaddr_t *src, const bdaddr_t *dst, struct hidp
 	memset(desc, 0, 4096);
 
 	ba2str(src, addr);
-	snprintf(filename, PATH_MAX, "%s/%s/hidd", STORAGEDIR, addr);
+	create_name(filename, PATH_MAX, STORAGEDIR, addr, "hidd");
 
 	ba2str(dst, addr);
 	str = textfile_get(filename, addr);
diff --git a/tools/hciconfig.c b/tools/hciconfig.c
index 04f9a8be..53ffec89 100644
--- a/tools/hciconfig.c
+++ b/tools/hciconfig.c
@@ -734,7 +734,7 @@ static int get_link_key(const bdaddr_t *local, const bdaddr_t *peer, uint8_t *ke
 	int i;
 
 	ba2str(local, addr);
-	snprintf(filename, PATH_MAX, "%s/%s/linkkeys", STORAGEDIR, addr);
+	create_name(filename, PATH_MAX, STORAGEDIR, addr, "linkkeys");
 
 	ba2str(peer, addr);
 	str = textfile_get(filename, addr);
diff --git a/tools/hcitool.c b/tools/hcitool.c
index f38fd1d0..ef33440f 100644
--- a/tools/hcitool.c
+++ b/tools/hcitool.c
@@ -281,7 +281,7 @@ static char *get_device_name(const bdaddr_t *local, const bdaddr_t *peer)
 	char filename[PATH_MAX + 1], addr[18];
 
 	ba2str(local, addr);
-	snprintf(filename, PATH_MAX, "%s/%s/names", STORAGEDIR, addr);
+	create_name(filename, PATH_MAX, STORAGEDIR, addr, "names");
 
 	ba2str(peer, addr);
 	return textfile_get(filename, addr);