Remove warnings from GCC-9

 - 'format-truncation' warnings

Change-Id: Id786451dc2dbca9cc5ad1e7a2f6d6e573eb99df4
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>

diff --git a/src/data/system/settings_clock.c b/src/data/system/settings_clock.c
index 52757aa..d549192 100755 (executable)
--- a/src/data/system/settings_clock.c
+++ b/src/data/system/settings_clock.c
@@ -201,8 +201,11 @@ char *settings_clock_get_clock_status_str()
                        strftime(str_buffer, MAX_DATETIME_LENGTH, "%d/%m/%Y %H:%M", tm_info);
                } else {
                        _DBG("is24h is FALSE");
-                       strftime(str_buffer, MAX_DATETIME_LENGTH, "%d/%m/%Y %I:%M", tm_info);
-                       strncat(str_buffer, (tm_info->tm_hour >= 12) ? " pm" : " am", 3);
+                       char temp_buffer[MAX_DATETIME_LENGTH];
+                       strftime(temp_buffer, MAX_DATETIME_LENGTH, "%d/%m/%Y %I:%M", tm_info);
+                       int ret = snprintf(str_buffer, MAX_DATETIME_LENGTH, "%s %s", temp_buffer, (tm_info->tm_hour >= 12) ? "pm" : "am");
+                       if(ret >= MAX_DATETIME_LENGTH)
+                               str_buffer[MAX_DATETIME_LENGTH-1] = '\0';
                }
 
 #endif

diff --git a/src/layout/layout_picture.c b/src/layout/layout_picture.c
index 86bd09c..065e742 100644 (file)
--- a/src/layout/layout_picture.c
+++ b/src/layout/layout_picture.c
@@ -135,7 +135,9 @@ static char *_get_contrast(void *data, int id)
        char con_str[5] = {0, };
        int con_val = settings_picture_get_contrast();
 
-       snprintf(con_str, sizeof(con_str), "%d", con_val);
+       int ret = snprintf(con_str, sizeof(con_str), "%d", con_val);
+       if(ret >= sizeof(con_str))
+               con_str[sizeof(con_str)-1] = '\0';
 
        return strdup(con_str);
 }
@@ -148,7 +150,9 @@ static char *_get_brightness(void *data, int id)
        if (b_val < 0)
                return NULL;
 
-       snprintf(b_str, sizeof(b_str), "%d", b_val);
+       int ret = snprintf(b_str, sizeof(b_str), "%d", b_val);
+       if(ret >= sizeof(b_str))
+               b_str[sizeof(b_str)-1] = '\0';
 
        return strdup(b_str);
 }
@@ -158,7 +162,9 @@ static char *_get_color(void *data, int id)
        char color_str[5] = {0, };
        int color_val = settings_picture_get_color();
 
-       snprintf(color_str, sizeof(color_str), "%d", color_val);
+       int ret = snprintf(color_str, sizeof(color_str), "%d", color_val);
+       if(ret >= sizeof(color_str))
+               color_str[sizeof(color_str)-1] = '\0';
 
        return strdup(color_str);
 }
@@ -168,7 +174,9 @@ static char *_get_tint(void *data, int id)
        char tint_str[8] = {0, };
        int tint_val = settings_picture_get_tint_g();
 
-       snprintf(tint_str, sizeof(tint_str), "%d %d", tint_val, 100 - tint_val);
+       int ret = snprintf(tint_str, sizeof(tint_str), "%d %d", tint_val, 100 - tint_val);
+       if(ret >= sizeof(tint_str))
+               tint_str[sizeof(tint_str)-1] = '\0';
 
        return strdup(tint_str);
 }

diff --git a/src/view/picture/view_picture_tint.c b/src/view/picture/view_picture_tint.c
index 71fe60d..1416742 100644 (file)
--- a/src/view/picture/view_picture_tint.c
+++ b/src/view/picture/view_picture_tint.c
@@ -38,7 +38,10 @@ void _get_tint_str(int val, char *tint_str)
 {
        SETTING_TRACE_BEGIN;
 
-       snprintf(tint_str, SLIDER_VAL_STR_L, "G %d R %d", val, 100 - val);
+       int ret = snprintf(tint_str, SLIDER_VAL_STR_L, "G %d R %d", val, 100 - val);
+       if(ret >= SLIDER_VAL_STR_L)
+               tint_str[SLIDER_VAL_STR_L-1] = '\0';
+
 }
 
 static Evas_Object *_create(Evas_Object *win, void *data)