From: saerome.kim Date: Thu, 26 Apr 2018 04:26:55 +0000 (+0900) Subject: mdg-manager: remove routine that returns unknown_error when coundn't X-Git-Tag: submit/tizen/20190131.065036~29 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8a610672e0d65dd4b87a29cf6d18c03194de62a0;p=platform%2Fcore%2Fapi%2Fmulti-device-group.git mdg-manager: remove routine that returns unknown_error when coundn't find any device. Signed-off-by: saerome.kim --- diff --git a/src/mdg-manager/src/mdgd_iot.cpp b/src/mdg-manager/src/mdgd_iot.cpp index ed80b4b..402a07b 100644 --- a/src/mdg-manager/src/mdgd_iot.cpp +++ b/src/mdg-manager/src/mdgd_iot.cpp @@ -1011,15 +1011,11 @@ static bool _found_resource(std::shared_ptr resource, static gboolean _timeout_cb(gpointer data) { - int ret = -1; + int ret = MDGD_ERROR_NONE; mdgd_command_t *cmd = (mdgd_command_t *)data; if (cmd->resource_type == MDGD_RESOURCE_TYPE_GROUP) { - if (found_group_count > 0) - ret = 0; - notify_group_find_finish(ret); - } else if (cmd->resource_type == MDGD_RESOURCE_TYPE_DATA) { if (cmd->command != MDGD_REQ_KEEP_ALIVE) notify_send_data_finish("RESP_DATA", last_get_result); @@ -1027,18 +1023,10 @@ static gboolean _timeout_cb(gpointer data) if (!strncmp(cmd->arg1, "disc_mot_enb_devs_done", strlen(cmd->arg1))) { LOG_DEBUG("Device Find Done. notified"); mdgd_group_notify_mot_enable_device_done(); - - if (mdgd_group_get_mot_device_count() > 0) - ret = 0; - notify_device_find_finish(ret); } else { LOG_DEBUG("MOT Device Find Done. notified"); mdgd_group_notify_mowned_device_find_done(); - - if (mdgd_group_get_mowned_device_count() > 0) - ret = 0; - notify_mowned_device_find_finish(ret); } } diff --git a/src/mdg-manager/src/mdgd_mot_agent.c b/src/mdg-manager/src/mdgd_mot_agent.c index f9978c9..16911bd 100644 --- a/src/mdg-manager/src/mdgd_mot_agent.c +++ b/src/mdg-manager/src/mdgd_mot_agent.c @@ -50,16 +50,24 @@ static char *device_uuid1 = NULL; static char *device_uuid2 = NULL; #endif +static int _check_agent_vaild(void) +{ + if (NULL == agent.dbus_connection || NULL == agent.gproxy_agent_service) { + LOG_ERR("I/O error"); + return MDGD_ERROR_IO_ERROR; + } + return MDGD_ERROR_NONE; +} + int agent_get_ownerid(char* deviceid) { GVariant *variant = NULL; int result = MDGD_ERROR_NONE; GError *error = NULL; - if (NULL == agent.dbus_connection || NULL == agent.gproxy_agent_service) { - LOG_ERR("I/O error"); - return MDGD_ERROR_IO_ERROR; - } + result = _check_agent_vaild(); + if (MDGD_ERROR_NONE != result) + return result; variant = g_dbus_proxy_call_sync(agent.gproxy_agent_service, "get_ownerid", NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error); @@ -83,10 +91,9 @@ int agent_find_mot_enable_devices(int timeout) int result = MDGD_ERROR_UNKNOWN; GError *error = NULL; - if (NULL == agent.dbus_connection || NULL == agent.gproxy_agent_service) { - LOG_ERR("I/O error"); - return MDGD_ERROR_IO_ERROR; - } + result = _check_agent_vaild(); + if (MDGD_ERROR_NONE != result) + return result; variant = g_dbus_proxy_call_sync(agent.gproxy_agent_service, "disc_mot_enb_devs", g_variant_new("(i)", timeout), G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error); @@ -110,10 +117,9 @@ int agent_find_mowned_devices(int timeout) int result = MDGD_ERROR_UNKNOWN; GError *error = NULL; - if (NULL == agent.dbus_connection || NULL == agent.gproxy_agent_service) { - LOG_ERR("I/O error"); - return MDGD_ERROR_IO_ERROR; - } + result = _check_agent_vaild(); + if (MDGD_ERROR_NONE != result) + return result; variant = g_dbus_proxy_call_sync(agent.gproxy_agent_service, "disc_mowned_devs", g_variant_new("(i)", timeout), G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error); @@ -137,10 +143,9 @@ int agent_mot(char* uuid_str, char *pin) int result = MDGD_ERROR_NONE; GError *error = NULL; - if (NULL == agent.dbus_connection || NULL == agent.gproxy_agent_service) { - LOG_ERR("I/O error"); - return MDGD_ERROR_IO_ERROR; - } + result = _check_agent_vaild(); + if (MDGD_ERROR_NONE != result) + return result; variant = g_dbus_proxy_call_sync(agent.gproxy_agent_service, "mot", g_variant_new("(ss)", uuid_str, pin), G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error); @@ -166,10 +171,9 @@ int agent_resources_pairwise(char* target1, char *subject1, char *uri1, int result = MDGD_ERROR_NONE; GError *error = NULL; - if (NULL == agent.dbus_connection || NULL == agent.gproxy_agent_service) { - LOG_ERR("I/O error"); - return MDGD_ERROR_IO_ERROR; - } + result = _check_agent_vaild(); + if (MDGD_ERROR_NONE != result) + return result; variant = g_dbus_proxy_call_sync(agent.gproxy_agent_service, "pairwise", g_variant_new("(sssssisssssi)", @@ -196,10 +200,9 @@ int agent_unlink_resources(char* uuid_str1, char *uuid_str2) int result = MDGD_ERROR_NONE; GError *error = NULL; - if (NULL == agent.dbus_connection || NULL == agent.gproxy_agent_service) { - LOG_ERR("I/O error"); - return MDGD_ERROR_IO_ERROR; - } + result = _check_agent_vaild(); + if (MDGD_ERROR_NONE != result) + return result; variant = g_dbus_proxy_call_sync(agent.gproxy_agent_service, "unlink", g_variant_new("(ss)", uuid_str1, uuid_str2), G_DBUS_CALL_FLAGS_NONE, @@ -229,10 +232,9 @@ int agent_remove_subowner(char* uuid_str) int result = MDGD_ERROR_NONE; GError *error = NULL; - if (NULL == agent.dbus_connection || NULL == agent.gproxy_agent_service) { - LOG_ERR("I/O error"); - return MDGD_ERROR_IO_ERROR; - } + result = _check_agent_vaild(); + if (MDGD_ERROR_NONE != result) + return result; variant = g_dbus_proxy_call_sync(agent.gproxy_agent_service, "remove_subowner", g_variant_new("(s)", uuid_str), G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error); @@ -256,10 +258,9 @@ int agent_remove_subowned(char* uuid_str) int result = MDGD_ERROR_NONE; GError *error = NULL; - if (NULL == agent.dbus_connection || NULL == agent.gproxy_agent_service) { - LOG_ERR("I/O error"); - return MDGD_ERROR_IO_ERROR; - } + result = _check_agent_vaild(); + if (MDGD_ERROR_NONE != result) + return result; variant = g_dbus_proxy_call_sync(agent.gproxy_agent_service, "remove_device", g_variant_new("(s)", uuid_str), G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error); @@ -285,10 +286,9 @@ int agent_pair(const char *pin, char* target1, const char *subject1, char *uri1, int result = MDGD_ERROR_NONE; GError *error = NULL; - if (NULL == agent.dbus_connection || NULL == agent.gproxy_agent_service) { - LOG_ERR("I/O error"); - return MDGD_ERROR_IO_ERROR; - } + result = _check_agent_vaild(); + if (MDGD_ERROR_NONE != result) + return result; variant = g_dbus_proxy_call_sync(agent.gproxy_agent_service, "pair", g_variant_new("(ssssssisssssi)", pin, @@ -315,10 +315,9 @@ int agent_unpair(char* uuid_str1, const char *uuid_str2) int result = MDGD_ERROR_NONE; GError *error = NULL; - if (NULL == agent.dbus_connection || NULL == agent.gproxy_agent_service) { - LOG_ERR("I/O error"); - return MDGD_ERROR_IO_ERROR; - } + result = _check_agent_vaild(); + if (MDGD_ERROR_NONE != result) + return result; variant = g_dbus_proxy_call_sync(agent.gproxy_agent_service, "unpair", g_variant_new("(ss)", uuid_str1, uuid_str2), G_DBUS_CALL_FLAGS_NONE, @@ -343,10 +342,9 @@ int agent_enable() int result = MDGD_ERROR_NONE; GError *error = NULL; - if (NULL == agent.dbus_connection || NULL == agent.gproxy_agent_service) { - LOG_ERR("I/O error"); - return MDGD_ERROR_IO_ERROR; - } + result = _check_agent_vaild(); + if (MDGD_ERROR_NONE != result) + return result; variant = g_dbus_connection_call_sync(agent.dbus_connection, AGENT_ENABLER_NAME, AGENT_ENABLER_OBJ_PATH, AGENT_ENABLER_INTERFACE, @@ -371,10 +369,9 @@ int agent_disable() int result = MDGD_ERROR_NONE; GError *error = NULL; - if (NULL == agent.dbus_connection || NULL == agent.gproxy_agent_service) { - LOG_ERR("I/O error"); - return MDGD_ERROR_IO_ERROR; - } + result = _check_agent_vaild(); + if (MDGD_ERROR_NONE != result) + return result; variant = g_dbus_connection_call_sync(agent.dbus_connection, AGENT_ENABLER_NAME, AGENT_ENABLER_OBJ_PATH, AGENT_ENABLER_INTERFACE, @@ -523,8 +520,6 @@ static void _agent_signal_handler(GDBusConnection *connection, const gchar *signal_name, GVariant *parameters, gpointer userdata) { int result = MDGD_ERROR_NONE; - struct agent_s *h = userdata; - mdgd_check_null_ret("userdata", userdata); LOG_DEBUG("signal received = %s", signal_name);