From ac75047aefd9a12a64955e6ce723b891dfd42991 Mon Sep 17 00:00:00 2001 From: David Maciejak Date: Fri, 17 Feb 2023 23:14:06 +0800 Subject: [PATCH] Fix mini workspace compiler warnings The patch is to fix warnings like: wsmap.c: In function "update_mini_workspace": wsmap.c:451:55: warning: "%d" directive output may be truncated writing between 1 and 11 bytes into a region of size 10 [-Wformat-truncation=] 451 | snprintf(name, sizeof(name), "%d", general_index); --- src/wsmap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/wsmap.c b/src/wsmap.c index 40281a73..9eae3cbd 100644 --- a/src/wsmap.c +++ b/src/wsmap.c @@ -337,9 +337,9 @@ static WMPixmap *get_mini_workspace(WWorkspaceMap *wsmap, int index) static void create_mini_workspace(WScreen *scr, WWorkspaceMap *wsmap, W_WorkspaceMap *wsmap_array) { - int workspace_index; + unsigned short workspace_index; int mini_workspace_cnt; - char name[10]; + char name[6]; WMButton *mini_workspace_btn; WMPixmap *icon; @@ -363,7 +363,7 @@ static void create_mini_workspace(WScreen *scr, WWorkspaceMap *wsmap, W_Workspac WMReleasePixmap(icon); } - snprintf(name, sizeof(name), "%d", workspace_index); + snprintf(name, sizeof(name), "%hu", workspace_index); WMSetButtonText(mini_workspace_btn, name); WMSetButtonAction(mini_workspace_btn, selected_workspace_callback, wsmap); } @@ -423,9 +423,9 @@ static WWorkspaceMap *create_workspace_map(WScreen *scr, W_WorkspaceMap *wsmap_a static void update_mini_workspace(WWorkspaceMap *wsmap, W_WorkspaceMap *wsmap_array, int bulk_of_ten) { - int local_index, general_index; + unsigned short local_index, general_index; int mini_workspace_cnt; - char name[10]; + char name[6]; WMPixmap *icon; if (bulk_of_ten == wsmap_bulk_index) @@ -448,7 +448,7 @@ static void update_mini_workspace(WWorkspaceMap *wsmap, W_WorkspaceMap *wsmap_ar if (general_index < wsmap->scr->workspace_count) { /* updating label */ WMSetLabelText(wsmap_array[local_index].workspace_label, wsmap->scr->workspaces[general_index]->name); - snprintf(name, sizeof(name), "%d", general_index); + snprintf(name, sizeof(name), "%hu", general_index); WMSetButtonText(wsmap_array[local_index].workspace_img_button, name); /* updating label background*/