From 39245ddf5d1a220702a03683b78f1b868606c60a Mon Sep 17 00:00:00 2001 From: Alok Barsode Date: Wed, 24 Aug 2011 16:53:18 +0300 Subject: storage: Switch to settings file All the global settings would reside in /var/lib/connman/settings. We also migrate global keys from /var/lib/connman/default.profile to /var/lib/connman/settings for a smooth transition. --- src/config.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'src/config.c') diff --git a/src/config.c b/src/config.c index 90a2180b..db152283 100644 --- a/src/config.c +++ b/src/config.c @@ -383,7 +383,7 @@ static int load_config(struct connman_config *config) DBG("config %p", config); - keyfile = __connman_storage_open_config(config->ident); + keyfile = __connman_storage_load_config(config->ident); if (keyfile == NULL) return -EIO; @@ -418,7 +418,7 @@ static int load_config(struct connman_config *config) g_strfreev(groups); - __connman_storage_close_config(config->ident, keyfile, FALSE); + g_key_file_free(keyfile); return 0; } @@ -453,7 +453,7 @@ int __connman_config_load_service(GKeyFile *keyfile, const char *group, { struct connman_config *config; const char *service_name; - char *ident, *filename = NULL, *content = NULL; + char *ident, *content = NULL; gsize content_length; int err; @@ -491,26 +491,15 @@ int __connman_config_load_service(GKeyFile *keyfile, const char *group, goto out; } - filename = g_strdup_printf("%s/%s.config", STORAGEDIR, ident); - if (filename == NULL) { - err = -ENOMEM; - goto out; - } - DBG("Saving %zu bytes to %s", content_length, service_name); - if (g_file_set_contents(filename, content, - content_length, NULL) == FALSE) { - err = -EIO; - goto out; - } + __connman_storage_save_config(keyfile, ident); return 0; out: g_free(ident); g_free(content); - g_free(filename); return err; } -- cgit v1.2.3