Remove warnings from GCC-9 11/221911/1 accepted/tizen/unified/20200109.065540 submit/tizen/20200108.090657
authorKiseok Chang <kiso.chang@samsung.com>
Wed, 8 Jan 2020 07:57:57 +0000 (16:57 +0900)
committerKiseok Chang <kiso.chang@samsung.com>
Wed, 8 Jan 2020 07:58:58 +0000 (16:58 +0900)
 - 'format-truncation' warnings

Change-Id: I1e1bd9d468cf5c7efe658c7486cc8f6419129f96
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>
setting-font/src/setting-font-main.c
setting-storage/src/setting-storage-main.c
setting-time/src/setting-time-main.c

index 88a28155dab222717ff49bb5b9a1ad0bc3a53f8a..83a6be68351b426ab5ba2b438d3bff11caa54927 100755 (executable)
@@ -101,6 +101,8 @@ static int _format_font_name_by_id(char *font_data, char *font_name_id,
        char new_name[bufsize];
        int i = 0;
        int count = 0;
+       int ret;
+
        while (*pos != '\0') {
                if (*pos == ' ') {
                        SETTING_TRACE(">>>      empty ' ' ");
@@ -123,8 +125,7 @@ static int _format_font_name_by_id(char *font_data, char *font_name_id,
        } else if (safeStrCmp(font_name_id, "IDS_ST_BODY_COOL_JAZZ") == 0) {
                snprintf(trans_font_type_name, bufsize, "%s",
                                _("IDS_ST_BODY_COOL_JAZZ"));
-       } else if (safeStrCmp(font_name_id, "IDS_ST_BODY_FONTSTYLE_ROSEMARY")
-                       == 0) {
+       } else if (safeStrCmp(font_name_id, "IDS_ST_BODY_FONTSTYLE_ROSEMARY") == 0) {
                snprintf(trans_font_type_name, bufsize, "%s",
                                _("IDS_ST_BODY_FONTSTYLE_ROSEMARY"));
        } else if (safeStrCmp(font_name_id, "IDS_ST_BODY_DEFAULT_FONT") == 0) {
@@ -133,8 +134,10 @@ static int _format_font_name_by_id(char *font_data, char *font_name_id,
        } else {
                snprintf(trans_font_type_name, bufsize, "%s", font_name_id);
        }
-       snprintf(temp, bufsize, "<font=%s>%s</font>", new_name,
-                       trans_font_type_name);
+       ret = snprintf(temp, bufsize, "<font=%s>%s</font>", new_name,   trans_font_type_name);
+       if (ret >= bufsize)
+               return 0;
+
        return 1;
 }
 
index 695336cf499ceeda79704089cab61baa0f11132f..caf447e7cdeed33a2e0d2d816304f1880e597496 100755 (executable)
@@ -158,6 +158,7 @@ Evas_Object *storage_main_graph_get(void *data, Evas_Object *obj,
        SettingStorage *ad = data;
        char size_str[STORAGE_MAX_STR_LEN] = {0};
        char final_str[STORAGE_MAX_STR_LEN] = {0};
+       int ret;
        retv_if(!obj, NULL);
        retv_if(!data, NULL);
        retvm_if(safeStrCmp(part, "elm.swallow.content"), NULL,
@@ -181,15 +182,17 @@ Evas_Object *storage_main_graph_get(void *data, Evas_Object *obj,
 
        /* - total */
        storage_size_to_str(ad->sz_inter_total, size_str, sizeof(size_str));
-       snprintf(final_str, sizeof(final_str), "%s : %s",
+       ret = snprintf(final_str, sizeof(final_str), "%s : %s",
                        _("IDS_ST_HEADER_TOTAL_SPACE"), size_str);
-       elm_object_part_text_set(layout, "TXT_TOTAL_SPACE", final_str);
+       if(ret < sizeof(final_str))
+               elm_object_part_text_set(layout, "TXT_TOTAL_SPACE", final_str);
 
        /* - free */
        storage_size_to_str(ad->sz_inter_avail, size_str, sizeof(size_str));
-       snprintf(final_str, sizeof(final_str), "%s space : %s",
+       ret = snprintf(final_str, sizeof(final_str), "%s space : %s",
                        _("IDS_SM_BODY_FREE_M_MEMORY_ABB"), size_str);
-       elm_object_part_text_set(layout, "TXT_FREE_SPACE", final_str);
+       if(ret < sizeof(final_str))
+               elm_object_part_text_set(layout, "TXT_FREE_SPACE", final_str);
 
        /* update sizes graph */
        _update_storage_graph(ad, layout);
index 7c3bb5da784e81fb15efa6aca5dcdaaeea625301..c982c02fc8ae00ddd9be0672f2828fd286e2e331 100755 (executable)
@@ -1287,8 +1287,8 @@ static void __setting_update_datefield_cb(void *cb)
        else
                time = __setting_phone_lang_get_by_pattern(region, "Hm");
 
-       strncpy(date_arr, date, DEF_BUF_SIZE);
-       strncpy(time_arr, time, DEF_BUF_SIZE);
+       memcpy(date_arr, date, DEF_BUF_SIZE);
+       memcpy(time_arr, time, DEF_BUF_SIZE);
        date_arr[DEF_BUF_SIZE - 1] = '\0';
        time_arr[DEF_BUF_SIZE - 1] = '\0';