From: Daniel Wagner <[email protected]>
We have now a service state getter and we do not need to pass
in the state.
---
src/connman.h | 1 -
src/service.c | 2 +-
src/session.c | 5 +++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/connman.h b/src/connman.h
index bbb59ed..204bd0c 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -775,7 +775,6 @@ void __connman_service_counter_unregister(const char
*counter);
#include <connman/session.h>
typedef void (* service_iterate_cb) (struct connman_service *service,
- enum connman_service_state state,
void *user_data);
int __connman_service_iterate_services(service_iterate_cb cb, void *user_data);
diff --git a/src/service.c b/src/service.c
index 6b6f36e..328f8f1 100644
--- a/src/service.c
+++ b/src/service.c
@@ -2149,7 +2149,7 @@ int __connman_service_iterate_services(service_iterate_cb
cb, void *user_data)
for (list = service_list; list; list = list->next) {
struct connman_service *service = list->data;
- cb(service, service->state, user_data);
+ cb(service, user_data);
}
return 0;
diff --git a/src/session.c b/src/session.c
index b9e57e0..131b16b 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1349,13 +1349,14 @@ static struct service_entry *create_service_entry(
}
static void iterate_service_cb(struct connman_service *service,
- enum connman_service_state state,
void *user_data)
{
struct connman_session *session = user_data;
+ enum connman_service_state service_state;
struct service_entry *entry;
- if (!is_connected(state))
+ service_state = __connman_service_get_state(service);
+ if (!is_connected(service_state))
return;
if (!service_match(session, service))
--
1.8.4.rc0.1.g8f6a3e5
_______________________________________________
connman mailing list
[email protected]
https://lists.connman.net/mailman/listinfo/connman
