Changed system_setting_platform.c for clean.

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

diff --git a/src/system_setting_platform.c b/src/system_setting_platform.c
index 5afa29c..b7ffc47 100644 (file)
--- a/src/system_setting_platform.c
+++ b/src/system_setting_platform.c
@@ -263,7 +263,9 @@ int system_setting_get_lockscreen_app(system_settings_key_e key, system_setting_
        SETTING_TRACE_BEGIN;
        char *pkg_name = NULL;
        int locktype = -1;
-       system_setting_vconf_get_value_int(VCONFKEY_SETAPPL_SCREEN_LOCK_TYPE_INT, &locktype);
+       if (system_setting_vconf_get_value_int(VCONFKEY_SETAPPL_SCREEN_LOCK_TYPE_INT, &locktype)) {
+               return SYSTEM_SETTINGS_ERROR_IO_ERROR;
+       }
 
        if (system_setting_vconf_get_value_string(VCONFKEY_SETAPPL_3RD_LOCK_PKG_NAME_STR, &pkg_name)) {
                return SYSTEM_SETTINGS_ERROR_IO_ERROR;
@@ -315,6 +317,8 @@ int system_setting_add_incoming_call_ringtone(system_settings_key_e key, system_
 {
        SETTING_TRACE_BEGIN;
        char* pathval = (char*)value;
+       char* dnameval = NULL;
+       char* baseval = NULL;
 
 #ifdef USE_JSONFILE
        // NOT IN USE
@@ -329,18 +333,23 @@ int system_setting_add_incoming_call_ringtone(system_settings_key_e key, system_
        // basename
        int ret = SYSTEM_SETTINGS_ERROR_NONE;
        if (false == ss_json_ringtone_contain(root, pathval)) {
-               SETTING_TRACE("---> dirname is : %s ", dirname(strdup(pathval)));
-               SETTING_TRACE("---> basename is : %s ", basename(strdup(pathval)));
                // @todo : MAKE SURE THE ACTUAL FILE IS THERE ON PATHVAL(SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER)
                ss_json_ringtone_add(root, JSONFILE, pathval, pathval);
                SETTING_TRACE("pathval is : %s -- OK", pathval);
        } else {
                SETTING_TRACE("pathval is duplicated : %s", pathval);
-               SETTING_TRACE("---> dirname is : %s ", dirname(strdup(pathval)));
-               SETTING_TRACE("---> basename is : %s ", basename(strdup(pathval)));
                ret = SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER;
        }
 
+       dnameval = strdup(pathval);
+       baseval = strdup(pathval);
+       if (dnameval && baseval) {
+               SETTING_TRACE("---> dirname is : %s ", dirname(dnameval));
+               SETTING_TRACE("---> basename is : %s ", basename(baseval));
+       }
+       FREE(dnameval);
+       FREE(baseval);
+
        if (parser) {
                g_object_unref(parser);
                parser = NULL;
@@ -698,33 +707,6 @@ static char *dl_get_default_font_info()
 }
 /*  LCOV_EXCL_STOP */
 
-/*  LCOV_EXCL_START */
-#define PATH_EXT_CHECK_REG ".(jpe?g|jpg|png|gif)$"
-bool __is_supported_image_type_by_ext(char *file_path)
-{
-       SETTING_TRACE_BEGIN;
-       regex_t fsm;
-       regmatch_t str[2048 + 1];
-
-       if (!file_path) return false;
-
-       int ret = false;
-       if ((ret = regcomp(&fsm, PATH_EXT_CHECK_REG, REG_ICASE | REG_EXTENDED))) {
-               SETTING_TRACE("regular expresstion fail");
-               return 1;
-       }
-
-       /* code */
-       if (regexec(&fsm, file_path, strlen(file_path) + 1, str, 0) == REG_NOMATCH) {
-               /*SETTING_TRACE("FAILED - %s", file_path[i]); */
-               ret = 0;
-       } else {
-               /*SETTING_TRACE("MATCHED - %s", file_path[i]); */
-               ret = 1;
-       }
-       return ret;
-}
-/*  LCOV_EXCL_STOP */
 #ifdef TIZEN_WEARABLE
 /*  LCOV_EXCL_START */
 static int system_setting_get_extended_wallpaper_num(const char *file_path, unsigned int *num)