Commit b1769473 authored by Slava Monich's avatar Slava Monich

service: Remove __connman_service_lookup_from_ident()

It was a duplicate of connman_service_lookup_from_identifier()

Conflicts:
	connman/src/connman.h
	connman/src/service.c
parent 53c1dc05
......@@ -141,6 +141,7 @@ int connman_service_iterate_services(connman_service_iterate_cb cb,
struct connman_service *connman_service_get_default(void);
struct connman_service *connman_service_lookup_from_network(struct connman_network *network);
void connman_service_update_strength_from_network(struct connman_network *network);
struct connman_service *connman_service_lookup_from_identifier(const char* identifier);
void connman_service_create_ip4config(struct connman_service *service,
int index);
......
......@@ -193,7 +193,7 @@ static void unregister_service(gpointer data)
list = list->next) {
service_id = list->data;
service = __connman_service_lookup_from_ident(service_id);
service = connman_service_lookup_from_identifier(service_id);
if (service) {
__connman_service_set_immutable(service, false);
__connman_service_set_config(service, NULL, NULL);
......
......@@ -153,7 +153,7 @@ static void get_gateway_cb(const char *gateway, int index, void *user_data)
if (!__connman_service_is_default_route(service)) {
DBG("Not setting gateway config of non default service %s",
service ? __connman_service_get_ident(service) : "");
service ? connman_service_get_identifier(service) : "");
goto out;
}
......@@ -861,7 +861,7 @@ int __connman_connection_gateway_add(struct connman_service *service,
if (!__connman_service_is_default_route(service)) {
DBG("Not adding gateways for non default VPN %s",
service ? __connman_service_get_ident(service) :
service ? connman_service_get_identifier(service) :
"");
goto done;
}
......
......@@ -704,7 +704,6 @@ const char *__connman_service_create(enum connman_service_type type,
const char *ident, GKeyFile *settings);
struct connman_service *__connman_service_lookup_from_index(int index);
struct connman_service *__connman_service_lookup_from_ident(const char *identifier);
bool __connman_service_create_from_network(struct connman_network *network);
struct connman_service *__connman_service_create_from_provider(struct connman_provider *provider);
bool __connman_service_index_is_default(int index);
......
......@@ -7975,6 +7975,11 @@ static struct connman_service *lookup_by_identifier(const char *identifier)
return g_hash_table_lookup(service_hash, identifier);
}
struct connman_service *connman_service_lookup_from_identifier(const char* identifier)
{
return identifier ? lookup_by_identifier(identifier) : NULL;
}
struct provision_user_data {
const char *ident;
int ret;
......@@ -8504,11 +8509,6 @@ struct connman_service *__connman_service_lookup_from_index(int index)
return NULL;
}
struct connman_service *__connman_service_lookup_from_ident(const char *identifier)
{
return lookup_by_identifier(identifier);
}
const char *connman_service_get_identifier(struct connman_service *service)
{
return service ? service->identifier : NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment