Fixed system_settings_get_item() return value.

Change-Id: I7ccd7940895af1c4884b5a82c94623b2af874885
Signed-off-by: jinwang.an <jinwang.an@samsung.com>

diff --git a/src/system_settings.c b/src/system_settings.c
index c2aec90..0ffeb05 100644 (file)
--- a/src/system_settings.c
+++ b/src/system_settings.c
@@ -545,10 +545,8 @@ int system_settings_get_item(system_settings_key_e key, system_setting_h *item)
                                int ret = system_setting_table[index].feature_check_cb(item);
                                if (ret == SYSTEM_SETTINGS_ERROR_NOT_SUPPORTED) {
                                        LOGE("Not supported API, because there is no feature!");
-                                       return ret;
                                }
-                               if (ret != SYSTEM_SETTINGS_ERROR_NONE)
-                                       return ret;
+                               return ret;
                        } else {
                                return SYSTEM_SETTINGS_ERROR_NONE;
                        }

diff --git a/system-settings-util/src/system_settings_util.c b/system-settings-util/src/system_settings_util.c
index e76a560..8f59288 100644 (file)
--- a/system-settings-util/src/system_settings_util.c
+++ b/system-settings-util/src/system_settings_util.c
@@ -360,6 +360,7 @@ _efl_config_set(char *msg)
                r = connect(fd, (struct sockaddr *)&server_addr, sizeof(server_addr));
                if (r != 0) {
                        SETTING_TRACE("connect error : %d, %d", r, errno);
+                       close(fd);
                        break;
                }
 
@@ -369,6 +370,7 @@ _efl_config_set(char *msg)
                } else {
                        ret = true;
                }
+               close(fd);
        } while (0);
 
        return ret;