storage: Remove obsolete functions that nobody calls

[framework/connectivity/connman.git] / src / service.c

diff --git a/src/service.c b/src/service.c
index 9220ad9..4ad75e8 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -4718,7 +4718,7 @@ static int service_indicate_state(struct connman_service *service)
                if (service->userconnect == TRUE &&
                        __connman_agent_report_error(service,
                                        error2string(service->error),
-                                       report_error_cb, NULL) == -EIO)
+                                       report_error_cb, NULL) == -EINPROGRESS)
                        return 0;
                service_complete(service);
        } else
@@ -5252,13 +5252,6 @@ int __connman_service_connect(struct connman_service *service)
                return -EINPROGRESS;
        }
 
-       __connman_service_ipconfig_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_FAILURE,
-                                       CONNMAN_IPCONFIG_TYPE_IPV4);
-       __connman_service_ipconfig_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_FAILURE,
-                                       CONNMAN_IPCONFIG_TYPE_IPV6);
-
        if (service->network != NULL)
                __connman_network_disconnect(service->network);
        else if (service->type == CONNMAN_SERVICE_TYPE_VPN &&
@@ -5267,10 +5260,8 @@ int __connman_service_connect(struct connman_service *service)
 
        if (service->userconnect == TRUE) {
                if (err == -ENOKEY || err == -EPERM) {
-                       if (__connman_agent_request_passphrase_input(service,
-                                                       request_input_cb,
-                                                       NULL) == -EIO)
-                               return -EINPROGRESS;
+                       return __connman_agent_request_passphrase_input(service,
+                                       request_input_cb, NULL);
                }
                reply_pending(service, -err);
        }
@@ -5936,7 +5927,7 @@ struct connman_service * __connman_service_create_from_network(struct connman_ne
 
        if (service->favorite == TRUE) {
                device = connman_network_get_device(service->network);
-               if (device && __connman_device_scanning(device) == FALSE)
+               if (device && connman_device_get_scanning(device) == FALSE)
                        __connman_service_auto_connect();
        }