svace fix

Change-Id: Ied1b5ed5a994f53e216e7d8f7105b28623031200
Signed-off-by: sanghyeok.oh <sanghyeok.oh@samsung.com>

diff --git a/apps/extended-sd/src/es-internal-storage-page.c b/apps/extended-sd/src/es-internal-storage-page.c
index 5274a8e..47b8c18 100644 (file)
--- a/apps/extended-sd/src/es-internal-storage-page.c
+++ b/apps/extended-sd/src/es-internal-storage-page.c
@@ -450,10 +450,12 @@ static Evas_Object* create_page_1(appdata_s* ad)
        Evas_Object* page_content = NULL;
        char *str_back;
        char *str_format;
-
-       page_content = create_layout(ad->internal_storage_page_data->internal_storage_page_base_layout, "page_with_2_bottom_button");
        Elm_Genlist_Item_Class *extended_multiline_genlist_itc;
        genlist_item_s *item;
+       Evas_Object* genlist;
+       Evas_Object* back_button;
+       Evas_Object* format_button;
+       page_content = create_layout(ad->internal_storage_page_data->internal_storage_page_base_layout, "page_with_2_bottom_button");
 
        extended_multiline_genlist_itc = elm_genlist_item_class_new();
        extended_multiline_genlist_itc->item_style = "extended-multiline";
@@ -462,7 +464,7 @@ static Evas_Object* create_page_1(appdata_s* ad)
        extended_multiline_genlist_itc->func.state_get = NULL;
        extended_multiline_genlist_itc->func.del = _internal_storage_page_genlist_del;
 
-       Evas_Object* genlist = elm_genlist_add(page_content);
+       genlist = elm_genlist_add(page_content);
        elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
        elm_object_part_content_set(page_content, "elm.swallow.content", genlist);
 
@@ -506,21 +508,20 @@ static Evas_Object* create_page_1(appdata_s* ad)
        item->it = elm_genlist_item_append(genlist, extended_multiline_genlist_itc, item, NULL, ELM_GENLIST_ITEM_NONE, NULL, item);
        elm_genlist_item_select_mode_set(item->it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
-       elm_genlist_item_class_free(extended_multiline_genlist_itc);
-
        str_back = dgettext(LANG_DOMAIN, "IDS_ST_BUTTON_BACK");
-       Evas_Object* back_button = create_bottom_button(page_content);
+       back_button = create_bottom_button(page_content);
        elm_object_text_set(back_button, str_back);
        elm_object_part_content_set(page_content, "bottom_button_1", back_button);
        evas_object_smart_callback_add(back_button, "clicked", navi_back_cb, ad);
 
        str_format = dgettext(LANG_DOMAIN, "IDS_ST_BUTTON_FORMAT_ABB3");
-       Evas_Object* format_button = create_bottom_button(page_content);
+       format_button = create_bottom_button(page_content);
        elm_object_text_set(format_button, str_format);
        elm_object_part_content_set(page_content, "bottom_button_2", format_button);
        evas_object_smart_callback_add(format_button, "clicked", _format_click_cb, ad);
 
 out:
+       elm_genlist_item_class_free(extended_multiline_genlist_itc);
        FUNC_END();
        return page_content;
 }
@@ -531,6 +532,7 @@ static Evas_Object* create_page_2(appdata_s* ad)
 
        Elm_Genlist_Item_Class *extended_multiline_genlist_itc;
        genlist_item_s *item;
+       Evas_Object* genlist;
 
        extended_multiline_genlist_itc = elm_genlist_item_class_new();
        extended_multiline_genlist_itc->item_style = "extended-multiline";
@@ -539,7 +541,7 @@ static Evas_Object* create_page_2(appdata_s* ad)
        extended_multiline_genlist_itc->func.state_get = NULL;
        extended_multiline_genlist_itc->func.del = _internal_storage_page_genlist_del;
 
-       Evas_Object* genlist = elm_genlist_add(ad->internal_storage_page_data->internal_storage_page_base_layout);
+       genlist = elm_genlist_add(ad->internal_storage_page_data->internal_storage_page_base_layout);
        elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
 
        item = (genlist_item_s *)malloc(sizeof(genlist_item_s));
@@ -582,10 +584,8 @@ static Evas_Object* create_page_2(appdata_s* ad)
        item->it = elm_genlist_item_append(genlist, extended_multiline_genlist_itc, item, NULL, ELM_GENLIST_ITEM_NONE, NULL, item);
        elm_genlist_item_select_mode_set(item->it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
-       elm_genlist_item_class_free(extended_multiline_genlist_itc);
-
-
 out:
+       elm_genlist_item_class_free(extended_multiline_genlist_itc);
        FUNC_END();
        return genlist;
 }
@@ -597,11 +597,14 @@ static Evas_Object* create_page_3(appdata_s* ad)
        Evas_Object* page_content = NULL;
        char *str_back;
        char *str_continue;
-
-       page_content = create_layout(ad->internal_storage_page_data->internal_storage_page_base_layout, "page_with_2_bottom_button");
+       Evas_Object* genlist;
+       Evas_Object* back_button;
+       Evas_Object* continue_button;
        Elm_Genlist_Item_Class *extended_multiline_genlist_itc;
        genlist_item_s *item;
 
+       page_content = create_layout(ad->internal_storage_page_data->internal_storage_page_base_layout, "page_with_2_bottom_button");
+
        extended_multiline_genlist_itc = elm_genlist_item_class_new();
        extended_multiline_genlist_itc->item_style = "extended-multiline";
        extended_multiline_genlist_itc->func.text_get = _internal_storage_page_genlist_text_get;
@@ -609,7 +612,7 @@ static Evas_Object* create_page_3(appdata_s* ad)
        extended_multiline_genlist_itc->func.state_get = NULL;
        extended_multiline_genlist_itc->func.del = _internal_storage_page_genlist_del;
 
-       Evas_Object* genlist = elm_genlist_add(page_content);
+       genlist = elm_genlist_add(page_content);
        elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
        elm_object_part_content_set(page_content, "elm.swallow.content", genlist);
 
@@ -643,21 +646,20 @@ static Evas_Object* create_page_3(appdata_s* ad)
        item->it = elm_genlist_item_append(genlist, extended_multiline_genlist_itc, item, NULL, ELM_GENLIST_ITEM_NONE, NULL, item);
        elm_genlist_item_select_mode_set(item->it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
-       elm_genlist_item_class_free(extended_multiline_genlist_itc);
-
        str_back = dgettext(LANG_DOMAIN, "IDS_ST_BUTTON_BACK");
-       Evas_Object* back_button = create_bottom_button(page_content);
+       back_button = create_bottom_button(page_content);
        elm_object_text_set(back_button, str_back);
        elm_object_part_content_set(page_content, "bottom_button_1", back_button);
        evas_object_smart_callback_add(back_button, "clicked", navi_back_cb, ad);
 
        str_continue = dgettext(LANG_DOMAIN, "IDS_ST_BUTTON_CONTINUE");
-       Evas_Object* continue_button = create_bottom_button(page_content);
+       continue_button = create_bottom_button(page_content);
        elm_object_text_set(continue_button, str_continue);
        elm_object_part_content_set(page_content, "bottom_button_2", continue_button);
        evas_object_smart_callback_add(continue_button, "clicked", _continue_click_cb, ad);
 
 out:
+       elm_genlist_item_class_free(extended_multiline_genlist_itc);
        FUNC_END();
        return page_content;
 }
@@ -668,6 +670,7 @@ static Evas_Object* create_page_4(appdata_s* ad)
 
        Elm_Genlist_Item_Class *extended_multiline_genlist_itc;
        genlist_item_s *item;
+       Evas_Object* genlist;
 
        extended_multiline_genlist_itc = elm_genlist_item_class_new();
        extended_multiline_genlist_itc->item_style = "extended-multiline";
@@ -676,7 +679,7 @@ static Evas_Object* create_page_4(appdata_s* ad)
        extended_multiline_genlist_itc->func.state_get = NULL;
        extended_multiline_genlist_itc->func.del = _internal_storage_page_genlist_del;
 
-       Evas_Object* genlist = elm_genlist_add(ad->internal_storage_page_data->internal_storage_page_base_layout);
+       genlist = elm_genlist_add(ad->internal_storage_page_data->internal_storage_page_base_layout);
        elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
 
        item = (genlist_item_s *)malloc(sizeof(genlist_item_s));
@@ -709,9 +712,8 @@ static Evas_Object* create_page_4(appdata_s* ad)
        item->it = elm_genlist_item_append(genlist, extended_multiline_genlist_itc, item, NULL, ELM_GENLIST_ITEM_NONE, NULL, item);
        elm_genlist_item_select_mode_set(item->it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
-       elm_genlist_item_class_free(extended_multiline_genlist_itc);
-
 out:
+       elm_genlist_item_class_free(extended_multiline_genlist_itc);
        FUNC_END();
        return genlist;
 }
@@ -722,10 +724,11 @@ static Evas_Object* create_page_5(appdata_s* ad)
 
        Evas_Object* page_content = NULL;
        char *str_done;
-
-       page_content = create_layout(ad->internal_storage_page_data->internal_storage_page_base_layout, "page_with_1_bottom_button");
+       Evas_Object* genlist;
        Elm_Genlist_Item_Class *extended_multiline_genlist_itc;
        genlist_item_s *item;
+       Evas_Object* done_button;
+       page_content = create_layout(ad->internal_storage_page_data->internal_storage_page_base_layout, "page_with_1_bottom_button");
 
        extended_multiline_genlist_itc = elm_genlist_item_class_new();
        extended_multiline_genlist_itc->item_style = "extended-multiline";
@@ -734,7 +737,7 @@ static Evas_Object* create_page_5(appdata_s* ad)
        extended_multiline_genlist_itc->func.state_get = NULL;
        extended_multiline_genlist_itc->func.del = _internal_storage_page_genlist_del;
 
-       Evas_Object* genlist = elm_genlist_add(page_content);
+       genlist = elm_genlist_add(page_content);
        elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
        elm_object_part_content_set(page_content, "elm.swallow.content", genlist);
 
@@ -798,15 +801,14 @@ static Evas_Object* create_page_5(appdata_s* ad)
        item->it = elm_genlist_item_append(genlist, extended_multiline_genlist_itc, item, NULL, ELM_GENLIST_ITEM_NONE, NULL, item);
        elm_genlist_item_select_mode_set(item->it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
-       elm_genlist_item_class_free(extended_multiline_genlist_itc);
-
        str_done = dgettext(LANG_DOMAIN, "IDS_ST_BUTTON_DONE");
-       Evas_Object* done_button = create_bottom_button(page_content);
+       done_button = create_bottom_button(page_content);
        elm_object_text_set(done_button, str_done);
        elm_object_part_content_set(page_content, "bottom_button_1", done_button);
        evas_object_smart_callback_add(done_button, "clicked", navi_done_cb, ad);
 
 out:
+       elm_genlist_item_class_free(extended_multiline_genlist_itc);
        FUNC_END();
        return page_content;
 }
@@ -829,7 +831,7 @@ void create_internal_storage_page_base_layout(appdata_s *ad)
                ad->internal_storage_page_data = NULL;
        }
 
-       internal_storage_page_data_s *internal_storage_page_data = (internal_storage_page_data_s *)malloc(sizeof(internal_storage_page_data));
+       internal_storage_page_data_s *internal_storage_page_data = (internal_storage_page_data_s *)malloc(sizeof(internal_storage_page_data_s));
        if (!internal_storage_page_data) {
                DMSG_ERR("malloc failed");
                FUNC_END();

diff --git a/apps/extended-sd/src/es-portable-storage-page.c b/apps/extended-sd/src/es-portable-storage-page.c
index b093347..7b3843a 100644 (file)
--- a/apps/extended-sd/src/es-portable-storage-page.c
+++ b/apps/extended-sd/src/es-portable-storage-page.c
@@ -386,13 +386,15 @@ static Evas_Object* create_page_1(appdata_s* ad)
        FUNC_BEGIN();
 
        Evas_Object* page_content = NULL;
-
-       page_content = create_layout(ad->portable_storage_page_data->portable_storage_page_base_layout, "page_with_2_bottom_button");
        Elm_Genlist_Item_Class *extended_multiline_genlist_itc;
        genlist_item_s *item;
-
        char *str_back;
        char *str_format;
+       Evas_Object* genlist;
+       Evas_Object* back_button;
+       Evas_Object* format_button;
+
+       page_content = create_layout(ad->portable_storage_page_data->portable_storage_page_base_layout, "page_with_2_bottom_button");
 
        extended_multiline_genlist_itc = elm_genlist_item_class_new();
        extended_multiline_genlist_itc->item_style = "extended-multiline";
@@ -401,7 +403,7 @@ static Evas_Object* create_page_1(appdata_s* ad)
        extended_multiline_genlist_itc->func.state_get = NULL;
        extended_multiline_genlist_itc->func.del = _portable_storage_page_genlist_del;
 
-       Evas_Object* genlist = elm_genlist_add(page_content);
+       genlist = elm_genlist_add(page_content);
        elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
        elm_object_part_content_set(page_content, "elm.swallow.content", genlist);
 
@@ -445,21 +447,20 @@ static Evas_Object* create_page_1(appdata_s* ad)
        item->it = elm_genlist_item_append(genlist, extended_multiline_genlist_itc, item, NULL, ELM_GENLIST_ITEM_NONE, NULL, item);
        elm_genlist_item_select_mode_set(item->it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
-       elm_genlist_item_class_free(extended_multiline_genlist_itc);
-
-       Evas_Object* back_button = create_bottom_button(page_content);
+       back_button = create_bottom_button(page_content);
        str_back = dgettext(LANG_DOMAIN, "IDS_ST_BUTTON_BACK");
        elm_object_text_set(back_button, str_back);
        elm_object_part_content_set(page_content, "bottom_button_1", back_button);
        evas_object_smart_callback_add(back_button, "clicked", navi_back_cb, ad);
 
-       Evas_Object* format_button = create_bottom_button(page_content);
+       format_button = create_bottom_button(page_content);
        str_format = dgettext(LANG_DOMAIN, "IDS_ST_BUTTON_FORMAT_ABB3");
        elm_object_text_set(format_button, str_format);
        elm_object_part_content_set(page_content, "bottom_button_2", format_button);
        evas_object_smart_callback_add(format_button, "clicked", _format_click_cb, ad);
 
 out:
+       elm_genlist_item_class_free(extended_multiline_genlist_itc);
        FUNC_END();
        return page_content;
 }
@@ -469,13 +470,14 @@ static Evas_Object* create_page_3(appdata_s* ad)
        FUNC_BEGIN();
 
        Evas_Object* page_content = NULL;
-
-       page_content = create_layout(ad->portable_storage_page_data->portable_storage_page_base_layout, "page_with_1_bottom_button");
        Elm_Genlist_Item_Class *extended_multiline_genlist_itc;
        genlist_item_s *item;
-
+       Evas_Object* done_button;
+       Evas_Object* genlist;
        char *str_done;
 
+       page_content = create_layout(ad->portable_storage_page_data->portable_storage_page_base_layout, "page_with_1_bottom_button");
+
        extended_multiline_genlist_itc = elm_genlist_item_class_new();
        extended_multiline_genlist_itc->item_style = "extended-multiline";
        extended_multiline_genlist_itc->func.text_get = _portable_storage_page_genlist_text_get;
@@ -483,7 +485,7 @@ static Evas_Object* create_page_3(appdata_s* ad)
        extended_multiline_genlist_itc->func.state_get = NULL;
        extended_multiline_genlist_itc->func.del = _portable_storage_page_genlist_del;
 
-       Evas_Object* genlist = elm_genlist_add(page_content);
+       genlist = elm_genlist_add(page_content);
        elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
        elm_object_part_content_set(page_content, "elm.swallow.content", genlist);
 
@@ -507,7 +509,6 @@ static Evas_Object* create_page_3(appdata_s* ad)
        item->it = elm_genlist_item_append(genlist, extended_multiline_genlist_itc, item, NULL, ELM_GENLIST_ITEM_NONE, NULL, item);
        elm_genlist_item_select_mode_set(item->it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
-
        item = (genlist_item_s *)malloc(sizeof(genlist_item_s));
        if (!item) {
                DMSG_ERR("malloc failed");
@@ -528,15 +529,14 @@ static Evas_Object* create_page_3(appdata_s* ad)
        item->it = elm_genlist_item_append(genlist, extended_multiline_genlist_itc, item, NULL, ELM_GENLIST_ITEM_NONE, NULL, item);
        elm_genlist_item_select_mode_set(item->it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
-       elm_genlist_item_class_free(extended_multiline_genlist_itc);
-
-       Evas_Object* done_button = create_bottom_button(page_content);
+       done_button = create_bottom_button(page_content);
        str_done = dgettext(LANG_DOMAIN, "IDS_ST_BUTTON_DONE");
        elm_object_text_set(done_button, str_done);
        elm_object_part_content_set(page_content, "bottom_button_1", done_button);
        evas_object_smart_callback_add(done_button, "clicked", navi_done_cb, ad);
 
 out:
+       elm_genlist_item_class_free(extended_multiline_genlist_itc);
        FUNC_END();
        return page_content;
 }
@@ -547,6 +547,7 @@ static Evas_Object* create_page_2(appdata_s* ad)
 
        Elm_Genlist_Item_Class *extended_multiline_genlist_itc;
        genlist_item_s *item;
+       Evas_Object* genlist;
 
        extended_multiline_genlist_itc = elm_genlist_item_class_new();
        extended_multiline_genlist_itc->item_style = "extended-multiline";
@@ -555,7 +556,7 @@ static Evas_Object* create_page_2(appdata_s* ad)
        extended_multiline_genlist_itc->func.state_get = NULL;
        extended_multiline_genlist_itc->func.del = _portable_storage_page_genlist_del;
 
-       Evas_Object* genlist = elm_genlist_add(ad->portable_storage_page_data->portable_storage_page_base_layout);
+       genlist = elm_genlist_add(ad->portable_storage_page_data->portable_storage_page_base_layout);
        elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
 
        item = (genlist_item_s *)malloc(sizeof(genlist_item_s));
@@ -588,9 +589,8 @@ static Evas_Object* create_page_2(appdata_s* ad)
        item->it = elm_genlist_item_append(genlist, extended_multiline_genlist_itc, item, NULL, ELM_GENLIST_ITEM_NONE, NULL, item);
        elm_genlist_item_select_mode_set(item->it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
-       elm_genlist_item_class_free(extended_multiline_genlist_itc);
-
 out:
+       elm_genlist_item_class_free(extended_multiline_genlist_itc);
        FUNC_END();
        return genlist;
 }
@@ -615,7 +615,7 @@ void create_portable_storage_page_base_layout(appdata_s *ad)
                ad->portable_storage_page_data = NULL;
        }
 
-       portable_storage_page_data_s* portable_storage_page_data = (portable_storage_page_data_s*)malloc(sizeof(portable_storage_page_data));
+       portable_storage_page_data_s* portable_storage_page_data = (portable_storage_page_data_s*)malloc(sizeof(portable_storage_page_data_s));
        if (!portable_storage_page_data) {
                DMSG_ERR("malloc failed");
                return;

diff --git a/src/block/block.c b/src/block/block.c
index c38632e..d87016d 100644 (file)
--- a/src/block/block.c
+++ b/src/block/block.c
@@ -3472,6 +3472,11 @@ static GVariant *request_check_speed(GDBusConnection *conn,
 
        _D("speed check: %s", data->devnode);
        fd = open(data->devnode, O_RDONLY | O_DIRECT);
+       if (fd < 0) {
+               _E("failed to open fd(%s) : %d", data->devnode, errno);
+               result = -1;
+               goto out;
+       }
        ret = posix_memalign((void**)&buf, 4096, SPEEDCHECK_SIZE << 20);
        if (ret) {
                _E("posix_memalign() failed");