diff options
author | Alok Barsode <alok.barsode@linux.intel.com> | 2011-08-24 16:44:27 +0300 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-08-25 11:14:24 +0200 |
commit | 0cabd8ff995b0e4028c6a391e87d48415034115c (patch) | |
tree | 3c165bd4311071b6f5f0d27051809ae46fc00c08 /src | |
parent | feebd4173c4eb75dbf0482bafbec32ae8db0835d (diff) | |
download | connman-0cabd8ff995b0e4028c6a391e87d48415034115c.tar.gz connman-0cabd8ff995b0e4028c6a391e87d48415034115c.tar.bz2 connman-0cabd8ff995b0e4028c6a391e87d48415034115c.zip |
storage: remove storage module framework
Diffstat (limited to 'src')
-rw-r--r-- | src/connman.h | 8 | ||||
-rw-r--r-- | src/main.c | 2 | ||||
-rw-r--r-- | src/storage.c | 89 |
3 files changed, 0 insertions, 99 deletions
diff --git a/src/connman.h b/src/connman.h index 614cb01d..b7dc0020 100644 --- a/src/connman.h +++ b/src/connman.h @@ -142,11 +142,6 @@ void __connman_resolver_cleanup(void); int __connman_resolvfile_append(const char *interface, const char *domain, const char *server); int __connman_resolvfile_remove(const char *interface, const char *domain, const char *server); -#include <connman/storage.h> - -int __connman_storage_init(void); -void __connman_storage_cleanup(void); - GKeyFile *__connman_storage_open(const char *ident, const char *suffix); void __connman_storage_close(const char *ident, const char *suffix, GKeyFile *keyfile, gboolean save); @@ -162,9 +157,6 @@ void __connman_storage_close_config(const char *ident, GKeyFile *keyfile, gboolean save); void __connman_storage_delete_config(const char *ident); -int __connman_storage_load_service(struct connman_service *service); -int __connman_storage_save_service(struct connman_service *service); - int __connman_detect_init(void); void __connman_detect_cleanup(void); @@ -334,7 +334,6 @@ int main(int argc, char *argv[]) parse_config(config); - __connman_storage_init(); __connman_technology_init(); __connman_notifier_init(); __connman_location_init(); @@ -409,7 +408,6 @@ int main(int argc, char *argv[]) __connman_location_cleanup(); __connman_notifier_cleanup(); __connman_technology_cleanup(); - __connman_storage_cleanup(); __connman_dbus_cleanup(); diff --git a/src/storage.c b/src/storage.c index 3444fbeb..271d49cc 100644 --- a/src/storage.c +++ b/src/storage.c @@ -31,47 +31,6 @@ #define PROFILE_SUFFIX "profile" #define CONFIG_SUFFIX "config" -static GSList *storage_list = NULL; - -static gint compare_priority(gconstpointer a, gconstpointer b) -{ - const struct connman_storage *storage1 = a; - const struct connman_storage *storage2 = b; - - return storage2->priority - storage1->priority; -} - -/** - * connman_storage_register: - * @storage: storage module - * - * Register a new storage module - * - * Returns: %0 on success - */ -int connman_storage_register(struct connman_storage *storage) -{ - DBG("storage %p name %s", storage, storage->name); - - storage_list = g_slist_insert_sorted(storage_list, storage, - compare_priority); - - return 0; -} - -/** - * connman_storage_unregister: - * @storage: storage module - * - * Remove a previously registered storage module - */ -void connman_storage_unregister(struct connman_storage *storage) -{ - DBG("storage %p name %s", storage, storage->name); - - storage_list = g_slist_remove(storage_list, storage); -} - GKeyFile *__connman_storage_open(const char *ident, const char *suffix) { GKeyFile *keyfile; @@ -180,51 +139,3 @@ void __connman_storage_delete_config(const char *ident) { __connman_storage_delete(ident, CONFIG_SUFFIX); } - -int __connman_storage_load_service(struct connman_service *service) -{ - GSList *list; - - DBG("service %p", service); - - for (list = storage_list; list; list = list->next) { - struct connman_storage *storage = list->data; - - if (storage->service_load) { - if (storage->service_load(service) == 0) - return 0; - } - } - - return -ENOENT; -} - -int __connman_storage_save_service(struct connman_service *service) -{ - GSList *list; - - DBG("service %p", service); - - for (list = storage_list; list; list = list->next) { - struct connman_storage *storage = list->data; - - if (storage->service_save) { - if (storage->service_save(service) == 0) - return 0; - } - } - - return -ENOENT; -} - -int __connman_storage_init(void) -{ - DBG(""); - - return 0; -} - -void __connman_storage_cleanup(void) -{ - DBG(""); -} |