Revert "Fixing build error" 95/89795/1
authorHyunho Kang <hhstark.kang@samsung.com>
Tue, 27 Sep 2016 05:25:57 +0000 (22:25 -0700)
committerHyunho Kang <hhstark.kang@samsung.com>
Tue, 27 Sep 2016 05:25:57 +0000 (22:25 -0700)
This reverts commit 5165f46db2c6f1d97dfb9cb49d0ac057ce425dfd.

Change-Id: I98975288c064a23b7345467db6462b4f05413e7a

src/widget_service.c

index a77cce4f31069f34a2c454703dfd32f37a11be61..b63dac5d89ab9291cc02a613bce7a5da40eabc05 100644 (file)
@@ -282,14 +282,14 @@ static int _resolution_update_from_file(void)
        int height_type = 0;
        int width = 0;
        int height = 0;
+       char *type_str;
        char *size_str;
        dictionary *dic;
        char *file_path = NULL;
        int key_num;
+       char **key_list;
        char key_format[MAX_COLUMN];
        int i;
-       char **key_list;
-       const char *type_str;
 
        file_path = _resolution_file_path();
        if (file_path == NULL)
@@ -303,11 +303,10 @@ static int _resolution_update_from_file(void)
        snprintf(key_format, sizeof(key_format), "%s:%s",
                        RESOLUTION_SECTION_NAME, RESOLUTION_FORMAT);
        key_num = iniparser_getsecnkeys(dic, RESOLUTION_SECTION_NAME);
-       key_list = (char**) malloc(sizeof(char*)*key_num);
-       key_list = iniparser_getseckeys(dic, RESOLUTION_SECTION_NAME, (const char**)key_list);
+       key_list = iniparser_getseckeys(dic, RESOLUTION_SECTION_NAME);
        for (i = 0; i < key_num; i++) {
                type_str = key_list[i];
-               size_str = iniparser_getstring(dic, (const char*)type_str, NULL);
+               size_str = iniparser_getstring(dic, type_str, NULL);
                if (sscanf(type_str, key_format, &width_type, &height_type) != 2) {
                        _E("Invalid syntax: [%s]", type_str);
                        continue;
@@ -320,8 +319,7 @@ static int _resolution_update_from_file(void)
                _resolution_update_size_list(width_type, height_type, width, height);
        }
        iniparser_freedict(dic);
-       free(key_list);
-       key_list = NULL;
+
        return WIDGET_ERROR_NONE;
 }