[PATCH fast-connect v4 2/7] storage: Export service loading function.

[Jukka Rissanen]

plugins/wifi.c needs to load services so export the function.
---
 Makefile.am       |    3 ++-
 include/storage.h |    1 +
 src/service.c     |    6 ++++--
 src/storage.c     |    2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6c349ed..bbdc55c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,8 @@ includedir = @includedir@/connman
 include_HEADERS = include/types.h include/log.h include/plugin.h \
                        include/notifier.h include/service.h \
                        include/resolver.h include/ipconfig.h \
-                       include/device.h include/network.h include/inet.h
+                       include/device.h include/network.h include/inet.h \
+                       include/storage.h
 
 nodist_include_HEADERS = include/version.h
 
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/service.c b/src/service.c
index 03afb39..176d305 100644
--- a/src/service.c
+++ b/src/service.c
@@ -29,6 +29,8 @@
 #include <netdb.h>
 #include <gdbus.h>
 
+#include <connman/storage.h>
+
 #include "connman.h"
 
 #define CONNECT_TIMEOUT                120
@@ -309,7 +311,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;
 
@@ -5125,7 +5127,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;
-- 
1.7.1

_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman