From: Daniel Wagner <[email protected]>
The service name can be retrieved via __connman_service_get_name()
if needed. The only user of service_iterate_cb() was session.c
which does not use the service name directly anymore.
---
src/connman.h | 1 -
src/service.c | 2 +-
src/session.c | 7 ++-----
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/connman.h b/src/connman.h
index a0f06bd..baccf68 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -774,7 +774,6 @@ void __connman_service_counter_unregister(const char
*counter);
#include <connman/session.h>
typedef void (* service_iterate_cb) (struct connman_service *service,
- const char *name,
enum connman_service_state state,
void *user_data);
diff --git a/src/service.c b/src/service.c
index 4ec425c..dca0dfd 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->name, service->state, user_data);
+ cb(service, service->state, user_data);
}
return 0;
diff --git a/src/session.c b/src/session.c
index c184dbb..6213994 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1358,7 +1358,6 @@ static void select_and_connect(struct connman_session
*session,
static struct service_entry *create_service_entry(
struct connman_session * session,
struct connman_service *service,
- const char *name,
enum connman_service_state state)
{
struct service_entry *entry;
@@ -1377,7 +1376,6 @@ static struct service_entry *create_service_entry(
}
static void iterate_service_cb(struct connman_service *service,
- const char *name,
enum connman_service_state state,
void *user_data)
{
@@ -1390,7 +1388,7 @@ static void iterate_service_cb(struct connman_service
*service,
if (!service_match(session, service))
return;
- entry = create_service_entry(session, service, name, state);
+ entry = create_service_entry(session, service, state);
if (!entry)
return;
@@ -2217,8 +2215,7 @@ static void service_add(struct connman_service *service,
sort_services, session);
} else {
- entry = create_service_entry(session, service, name,
- state);
+ entry = create_service_entry(session, service, state);
if (!entry)
continue;
--
1.8.4.rc0.1.g8f6a3e5
_______________________________________________
connman mailing list
[email protected]
https://lists.connman.net/mailman/listinfo/connman
