From 83d98c2a054236f0a4fecde5e4788ca96f19686b Mon Sep 17 00:00:00 2001 From: Lukasz Stanislawski Date: Fri, 10 Jan 2020 17:16:28 +0100 Subject: [PATCH] [Tizen 6.0] adjust to new compilation flags * fix '-Wstringop-overflow=' * fix '-Wformat-truncation' Change-Id: Iaccb160316cfbaf79b7dd7313bb8e6ad7d89d5aa --- src/index.c | 6 ++---- src/popup.c | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/index.c b/src/index.c index bbd65cc..42d8c3c 100644 --- a/src/index.c +++ b/src/index.c @@ -63,7 +63,7 @@ HAPI Evas_Object *index_create(Evas_Object *tab, unsigned int count, unsigned in Evas_Object *index; Evas_Object *scroller; register int i; - char *number; + char number[16]; retv_if(NULL == tab, NULL); index = elm_index_add(tab); @@ -74,11 +74,10 @@ HAPI Evas_Object *index_create(Evas_Object *tab, unsigned int count, unsigned in elm_index_horizontal_set(index, EINA_TRUE); elm_index_autohide_disabled_set(index, EINA_TRUE); - number = malloc(((size_t) log10((double) MAX_PAGE_NO)) + 2); retv_if(NULL == number, NULL); for (i = 0; i < count; i++) { - snprintf(number, ((size_t) log10((double) MAX_PAGE_NO)) + 2, "%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); @@ -105,7 +104,6 @@ HAPI Evas_Object *index_create(Evas_Object *tab, unsigned int count, unsigned in _D("COUNT:%d", count); evas_object_show(index); - free(number); return index; } diff --git a/src/popup.c b/src/popup.c index 0ded9cc..bc81fc6 100644 --- a/src/popup.c +++ b/src/popup.c @@ -170,9 +170,8 @@ static char *_popup_set_name(Evas_Object *item) if(!get_name) get_name = item_get_package(item); retv_if(NULL == get_name, NULL); - name = calloc(strlen(get_name)+1, sizeof(char)); + name = strdup(get_name); retv_if(NULL == name, NULL); - strncpy(name, get_name, strlen(get_name)); if (strlen(name) > STRSZE) { char *temp, *ellipsis = ELLIPSIS; -- 2.7.4