[PATCH 3/7] adapter: Add destination file to convert_file()
From: Frédéric Danis <hidden>
Date: 2012-11-27 08:49:49
Subsystem:
the rest · Maintainer:
Linus Torvalds
In order to convert keys and longtermkeys, we will need to use different target file names. --- src/adapter.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index 3f184fc..9d6554a 100644
--- a/src/adapter.c
+++ b/src/adapter.c@@ -2556,6 +2556,7 @@ static void convert_names_entry(char *key, char *value, void *user_data) struct device_converter { char *address; void (*cb)(GKeyFile *key_file, void *value); + char *filename; }; static void convert_aliases_entry(GKeyFile *key_file, void *value)
@@ -2631,8 +2632,8 @@ static void convert_entry(char *key, char *value, void *user_data) if (bachk(key) != 0) return; - snprintf(filename, PATH_MAX, STORAGEDIR "/%s/%s/info", - converter->address, key); + snprintf(filename, PATH_MAX, STORAGEDIR "/%s/%s/%s", + converter->address, key, converter->filename); filename[PATH_MAX] = '\0'; create_file(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
@@ -2647,7 +2648,7 @@ static void convert_entry(char *key, char *value, void *user_data) g_key_file_free(key_file); } -static void convert_file(char *file, char *address, +static void convert_file(char *file, char *address, char *dest_file, void (*cb)(GKeyFile *key_file, void *value)) { char filename[PATH_MAX + 1];
@@ -2663,6 +2664,7 @@ static void convert_file(char *file, char *address, } else { converter.address = address; converter.cb = cb; + converter.filename = dest_file; textfile_foreach(filename, convert_entry, &converter); textfile_put(filename, "converted", "yes");
@@ -2692,19 +2694,19 @@ static void convert_device_storage(struct btd_adapter *adapter) free(str); /* Convert aliases */ - convert_file("aliases", address, convert_aliases_entry); + convert_file("aliases", address, "info", convert_aliases_entry); /* Convert trusts */ - convert_file("trusts", address, convert_trusts_entry); + convert_file("trusts", address, "info", convert_trusts_entry); /* Convert classes */ - convert_file("classes", address, convert_classes_entry); + convert_file("classes", address, "info", convert_classes_entry); /* Convert blocked */ - convert_file("blocked", address, convert_blocked_entry); + convert_file("blocked", address, "info", convert_blocked_entry); /* Convert device ids */ - convert_file("did", address, convert_did_entry); + convert_file("did", address, "info", convert_did_entry); } static void convert_config(struct btd_adapter *adapter, const char *filename,
--
1.7.9.5