From 434890b2816e24d5ec93ad1044fbf21eb6b10903 Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Tue, 13 Sep 2011 09:55:12 +0300 Subject: [PATCH] storage: Export service loading function --- include/storage.h | 1 + src/connman.h | 1 - src/service.c | 6 ++++-- src/storage.c | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/storage.h b/include/storage.h index cd05c60..c108511 100644 --- a/include/storage.h +++ b/include/storage.h @@ -29,6 +29,7 @@ extern "C" { #endif gchar **connman_storage_get_services(); +GKeyFile *connman_storage_load_service(const char *service_id); #ifdef __cplusplus } diff --git a/src/connman.h b/src/connman.h index 364cdd5..18c29c5 100644 --- a/src/connman.h +++ b/src/connman.h @@ -155,7 +155,6 @@ void __connman_storage_save_config(GKeyFile *keyfile, const char *ident); void __connman_storage_delete_config(const char *ident); GKeyFile *__connman_storage_open_service(const char *ident); -GKeyFile *__connman_storage_load_service(const char *ident); void __connman_storage_save_service(GKeyFile *keyfile, const char *ident); int __connman_detect_init(void); diff --git a/src/service.c b/src/service.c index 6bfcc19..23916f7 100644 --- a/src/service.c +++ b/src/service.c @@ -29,6 +29,8 @@ #include #include +#include + #include "connman.h" #define CONNECT_TIMEOUT 120 @@ -308,7 +310,7 @@ static int service_load(struct connman_service *service) DBG("service %p", service); - keyfile = __connman_storage_load_service(service->identifier); + keyfile = connman_storage_load_service(service->identifier); if (keyfile == NULL) return -EIO; @@ -5119,7 +5121,7 @@ void __connman_service_read_ip6config(struct connman_service *service) if (service->ipconfig_ipv6 == NULL) return; - keyfile = __connman_storage_load_service(service->identifier); + keyfile = connman_storage_load_service(service->identifier); if (keyfile == NULL) return; diff --git a/src/storage.c b/src/storage.c index 1755650..d987f91 100644 --- a/src/storage.c +++ b/src/storage.c @@ -237,7 +237,7 @@ gchar **connman_storage_get_services() return services; } -GKeyFile *__connman_storage_load_service(const char *service_id) +GKeyFile *connman_storage_load_service(const char *service_id) { gchar *pathname; GKeyFile *keyfile = NULL; -- 2.7.4