service: Remove unused __connman_service_*() functions

These were only used in session.c which does not depend on them
anymore.

diff --git a/src/connman.h b/src/connman.h
index 6eb04e8..fd67cf2 100644 (file)
--- a/src/connman.h
+++ b/src/connman.h
@@ -587,11 +587,6 @@ GSequence *__connman_service_get_list(struct connman_session *session,
                                create_service_entry_cb create_service_entry,
                                GDestroyNotify destroy_service_entry);
 
-connman_bool_t __connman_service_is_connecting(struct connman_service *service);
-connman_bool_t __connman_service_is_connected(struct connman_service *service);
-connman_bool_t __connman_service_is_idle(struct connman_service *service);
-const char *__connman_service_get_name(struct connman_service *service);
-
 void __connman_service_session_inc(struct connman_service *service);
 connman_bool_t __connman_service_session_dec(struct connman_service *service);
 

diff --git a/src/service.c b/src/service.c
index b0a9444..69e711a 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -479,15 +479,6 @@ static connman_bool_t is_connected(struct connman_service *service)
        return is_connected_state(service, state);
 }
 
-static connman_bool_t is_idle(struct connman_service *service)
-{
-       enum connman_service_state state;
-
-       state = combine_state(service->state_ipv4, service->state_ipv6);
-
-       return state == CONNMAN_SERVICE_STATE_IDLE;
-}
-
 static void update_nameservers(struct connman_service *service)
 {
        const char *ifname;
@@ -1603,26 +1594,6 @@ GSequence *__connman_service_get_list(struct connman_session *session,
        return list;
 }
 
-connman_bool_t __connman_service_is_connecting(struct connman_service *service)
-{
-       return is_connecting(service);
-}
-
-connman_bool_t __connman_service_is_connected(struct connman_service *service)
-{
-       return is_connected(service);
-}
-
-connman_bool_t __connman_service_is_idle(struct connman_service *service)
-{
-       return is_idle(service);
-}
-
-const char *__connman_service_get_name(struct connman_service *service)
-{
-       return service->name;
-}
-
 void __connman_service_session_inc(struct connman_service *service)
 {
        DBG("service %p", service);

diff --git a/src/session.c b/src/session.c
index 7684a00..febc506 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -1028,7 +1028,7 @@ static void update_allowed_bearers(struct connman_session *session)
 
                DBG("service %p type %s name %s", entry->service,
                        service2bearer(connman_service_get_type(entry->service)),
-                       __connman_service_get_name(entry->service));
+                       entry->name);
 
                g_hash_table_replace(session->service_hash,
                                        entry->service, iter);