Fixed svace

Change-Id: I3174fca0498a8b25ef704e600d223fb01734c89b

diff --git a/src/all_apps/list.c b/src/all_apps/list.c
index 9b72d12..40e1190 100644 (file)
--- a/src/all_apps/list.c
+++ b/src/all_apps/list.c
@@ -227,10 +227,12 @@ HAPI app_list *all_apps_list_create(void)
 
                for(i = (MAX_PAGE_NO * PAGE_MAX_APP); i<count; i++) {
                        app_list_item *item = list_nth(list, (MAX_PAGE_NO * PAGE_MAX_APP));
-                       if(!item)
-                       _E("Cannot remove an item(%s)", item->package);
 
-                       _D("%d: %s is removed", i, item->package);
+                       if (item && item->package) {
+                               _D("%d: %s is removed", i, item->package);
+                       } else {
+                               _E("There's something wrong!!");
+                       }
 
                        retv_if(MENU_SCREEN_ERROR_FAIL == list_remove_item(list, item), NULL);
                }

diff --git a/src/index.c b/src/index.c
index d01b84a..cb90036 100644 (file)
--- a/src/index.c
+++ b/src/index.c
@@ -78,7 +78,7 @@ HAPI Evas_Object *index_create(Evas_Object *tab, unsigned int count, unsigned in
        retv_if(NULL == number, NULL);
 
        for (i = 0; i < count; i++) {
-               sprintf(number, "%d", i + 1);
+               snprintf(number, sizeof(number), "%d", i + 1);
                elm_index_item_append(index, number, NULL, (void *) i);
        }
        elm_index_level_go(index, 0);

diff --git a/src/item.c b/src/item.c
index cb5a7de..6920bcc 100644 (file)
--- a/src/item.c
+++ b/src/item.c
@@ -340,7 +340,7 @@ HAPI void item_show_badge(Evas_Object *obj, int value)
        ret_if(NULL == obj);
        ret_if(value <= 0);
 
-       sprintf(str, "%d", value);
+       snprintf(str, sizeof(str), "%d", value);
        if (edje_object_part_text_set(_EDJ(obj), "badge,txt", str) == EINA_FALSE) {
                _E("Failed to set text on the part, edje:%p, part:%s, text:%s", _EDJ(obj), "badge,txt", str);
        }

diff --git a/src/key.c b/src/key.c
index f1eb244..9142cb4 100644 (file)
--- a/src/key.c
+++ b/src/key.c
@@ -109,7 +109,10 @@ static Eina_Bool _key_release_cb(void *data, int type, void *event)
 
                        /* If there are no items to be focused after pressing keys,
                           Menu-screen forces to focus the first item of the other page */
-                       int rest = x % w;
+                       int rest = 0;
+                       if (w) {
+                               rest = x % w;
+                       }
                        if (rest) {
                                page_scroller_focus_into_vector(scroller, rest > w / 2 ? -1 : 1);
                        }

diff --git a/src/page.c b/src/page.c
index 1791481..c379d3d 100644 (file)
--- a/src/page.c
+++ b/src/page.c
@@ -337,7 +337,7 @@ HAPI menu_screen_error_e page_unpack_item(Evas_Object *page, Evas_Object *item)
        }
 
        retv_if(pending_idx == -1, MENU_SCREEN_ERROR_FAIL);
-       sprintf(tmp, "menu_swallow_%d", pending_idx);
+       snprintf(tmp, sizeof(tmp), "menu_swallow_%d", pending_idx);
 
        check_item = edje_object_part_swallow_get(_EDJ(page), tmp);
        retv_if(check_item != item, MENU_SCREEN_ERROR_FAIL);
@@ -380,7 +380,7 @@ HAPI Evas_Object *page_unpack_item_at(Evas_Object *page, int idx)
        object = page_get_item_at(page, idx);
        if (object) {
                Evas_Object *check_object;
-               sprintf(tmp, "menu_swallow_%d", idx);
+               snprintf(tmp, sizeof(tmp), "menu_swallow_%d", idx);
 
                check_object = elm_object_part_content_unset(page, tmp);
                if (check_object != object) {

diff --git a/src/page_scroller.c b/src/page_scroller.c
index f7c1413..71739ba 100644 (file)
--- a/src/page_scroller.c
+++ b/src/page_scroller.c
@@ -933,6 +933,8 @@ HAPI void page_scroller_trim_items(Evas_Object *scroller)
        Eina_List *list = NULL;
 
        page_max_app = (int) evas_object_data_get(scroller, "page_max_app");
+       ret_if (page_max_app == 0);
+
        for (i = 0; i < MAX_PAGE_NO; i ++) {
                page = page_scroller_get_page_at(scroller, i);
                if (!page) break;