From eba852316735daec27d4ff11483018ca596312d0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Oct 2021 02:11:49 -0700 Subject: [PATCH] Fix a lot of -Werror=format-security errors with mvprintw/mvwprintw In all these places a non-constant is used as a format string which compiler complains about. Fix by using "%s" as format. Upstream-Status: Pending Signed-off-by: Khem Raj --- lmon16m.c | 86 +++++++++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/lmon16m.c b/lmon16m.c index 7e46642..1d53367 100644 --- a/lmon16m.c +++ b/lmon16m.c @@ -5475,20 +5475,20 @@ int main(int argc, char **argv) /* *mvwprintw(padsmp,2, 0, "CPU User%% Sys%% Wait%% Idle|0 |25 |50 |75 100|"); */ - mvwprintw(padsmp, 1, 0, cpu_line); - mvwprintw(padsmp, 2, 0, "CPU "); + mvwprintw(padsmp, 1, 0, "%s", cpu_line); + mvwprintw(padsmp, 2, 0, "%s", "CPU "); COLOUR wattrset(padsmp, COLOR_PAIR(2)); /* Green */ - mvwprintw(padsmp, 2, 4, "User%%"); + mvwprintw(padsmp, 2, 4, "%s", "User%%"); COLOUR wattrset(padsmp, COLOR_PAIR(1)); /* Red */ - mvwprintw(padsmp, 2, 9, " Sys%%"); + mvwprintw(padsmp, 2, 9, "%s", " Sys%%"); COLOUR wattrset(padsmp, COLOR_PAIR(4)); /* Blue */ - mvwprintw(padsmp, 2, 15, " Wait%%"); + mvwprintw(padsmp, 2, 15, "%s", " Wait%%"); if (p->cpu_total.steal != q->cpu_total.steal) { COLOUR wattrset(padsmp, COLOR_PAIR(5)); - mvwprintw(padsmp, 2, 22, "Steal"); + mvwprintw(padsmp, 2, 22, "%s", "Steal"); } else { COLOUR wattrset(padsmp, COLOR_PAIR(0)); - mvwprintw(padsmp, 2, 22, " Idle"); + mvwprintw(padsmp, 2, 22, "%s", " Idle"); } COLOUR wattrset(padsmp, COLOR_PAIR(0)); mvwprintw(padsmp, 2, 27, @@ -5579,8 +5579,8 @@ int main(int argc, char **argv) /* lparcfg gathered above */ if (lparcfg.smt_mode > 1 && i % lparcfg.smt_mode == 0) { - mvwprintw(padsmp, 3 + i, 27, "*"); - mvwprintw(padsmp, 3 + i, 77, "*"); + mvwprintw(padsmp, 3 + i, 27, "%s", "*"); + mvwprintw(padsmp, 3 + i, 77, "%s", "*"); } #endif @@ -5597,7 +5597,7 @@ int main(int argc, char **argv) 100.0); } } /* for (i = 0; i < cpus; i++) */ - CURSE mvwprintw(padsmp, i + 3, 0, cpu_line); + CURSE mvwprintw(padsmp, i + 3, 0, "%s", cpu_line); #ifdef POWER /* proc_lparcfg called above in previous ifdef */ @@ -5673,7 +5673,7 @@ int main(int argc, char **argv) 100.0); } - CURSE mvwprintw(padsmp, i + 5, 0, cpu_line); + CURSE mvwprintw(padsmp, i + 5, 0, "%s", cpu_line); i = i + 2; } /* if (cpus > 1 || !cursed) */ smp_first_time = 0; @@ -5704,16 +5704,16 @@ int main(int argc, char **argv) char *wide10 = " 10%%-| |-10%%"; - mvwprintw(padwide, 1, 0, wide1); - mvwprintw(padwide, 2, 0, wide2); - mvwprintw(padwide, 3, 0, wide3); - mvwprintw(padwide, 4, 0, wide4); - mvwprintw(padwide, 5, 0, wide5); - mvwprintw(padwide, 6, 0, wide6); - mvwprintw(padwide, 7, 0, wide7); - mvwprintw(padwide, 8, 0, wide8); - mvwprintw(padwide, 9, 0, wide9); - mvwprintw(padwide, 10, 0, wide10); + mvwprintw(padwide, 1, 0, "%s", wide1); + mvwprintw(padwide, 2, 0, "%s", wide2); + mvwprintw(padwide, 3, 0, "%s", wide3); + mvwprintw(padwide, 4, 0, "%s", wide4); + mvwprintw(padwide, 5, 0, "%s", wide5); + mvwprintw(padwide, 6, 0, "%s", wide6); + mvwprintw(padwide, 7, 0, "%s", wide7); + mvwprintw(padwide, 8, 0, "%s", wide8); + mvwprintw(padwide, 9, 0, "%s", wide9); + mvwprintw(padwide, 10, 0, "%s", wide10); mvwprintw(padwide, 11, 0, " CPU +1--------+10-------+20-------+30-------+40-------+50-------+60--+--0%%"); mvwprintw(padwide, 1, 6, "CPU(s)=%d", cpus); @@ -5755,16 +5755,16 @@ int main(int argc, char **argv) rows = 12; } if (cpus > 63) { - mvwprintw(padwide, rows + 0, 0, wide1); - mvwprintw(padwide, rows + 1, 0, wide2); - mvwprintw(padwide, rows + 2, 0, wide3); - mvwprintw(padwide, rows + 3, 0, wide4); - mvwprintw(padwide, rows + 4, 0, wide5); - mvwprintw(padwide, rows + 5, 0, wide6); - mvwprintw(padwide, rows + 6, 0, wide7); - mvwprintw(padwide, rows + 7, 0, wide8); - mvwprintw(padwide, rows + 8, 0, wide9); - mvwprintw(padwide, rows + 9, 0, wide10); + mvwprintw(padwide, rows + 0, 0, "%s", wide1); + mvwprintw(padwide, rows + 1, 0, "%s", wide2); + mvwprintw(padwide, rows + 2, 0, "%s", wide3); + mvwprintw(padwide, rows + 3, 0, "%s", wide4); + mvwprintw(padwide, rows + 4, 0, "%s", wide5); + mvwprintw(padwide, rows + 5, 0, "%s", wide6); + mvwprintw(padwide, rows + 6, 0, "%s", wide7); + mvwprintw(padwide, rows + 7, 0, "%s", wide8); + mvwprintw(padwide, rows + 8, 0, "%s", wide9); + mvwprintw(padwide, rows + 9, 0, "%s", wide10); mvwprintw(padwide, rows + 10, 0, " CPU +65---+70-------+80-------+90-------+100------+110------+120-----+--0%%"); if (wide_first_time) { @@ -5813,16 +5813,16 @@ int main(int argc, char **argv) rows = 23; } if (cpus > 127) { - mvwprintw(padwide, rows + 0, 0, wide1); - mvwprintw(padwide, rows + 1, 0, wide2); - mvwprintw(padwide, rows + 2, 0, wide3); - mvwprintw(padwide, rows + 3, 0, wide4); - mvwprintw(padwide, rows + 4, 0, wide5); - mvwprintw(padwide, rows + 5, 0, wide6); - mvwprintw(padwide, rows + 6, 0, wide7); - mvwprintw(padwide, rows + 7, 0, wide8); - mvwprintw(padwide, rows + 8, 0, wide9); - mvwprintw(padwide, rows + 9, 0, wide10); + mvwprintw(padwide, rows + 0, 0, "%s", wide1); + mvwprintw(padwide, rows + 1, 0, "%s", wide2); + mvwprintw(padwide, rows + 2, 0, "%s", wide3); + mvwprintw(padwide, rows + 3, 0, "%s", wide4); + mvwprintw(padwide, rows + 4, 0, "%s", wide5); + mvwprintw(padwide, rows + 5, 0, "%s", wide6); + mvwprintw(padwide, rows + 6, 0, "%s", wide7); + mvwprintw(padwide, rows + 7, 0, "%s", wide8); + mvwprintw(padwide, rows + 8, 0, "%s", wide9); + mvwprintw(padwide, rows + 9, 0, "%s", wide10); mvwprintw(padwide, rows + 10, 0, " CPU +129--------+140------+150------+160------+170------+180------+190--0%%"); if (wide_first_time) { @@ -8274,7 +8274,7 @@ I/F Name Recv=KB/s Trans=KB/s packin packout insize outsize Peak->Recv Trans formatstring = " PID %%CPU Size Res Res Res Res Shared Faults Command"; } - CURSE mvwprintw(padtop, 1, y, formatstring); + CURSE mvwprintw(padtop, 1, y, "%s", formatstring); if (show_args == ARGS_ONLY) { formatstring = @@ -8294,7 +8294,7 @@ I/F Name Recv=KB/s Trans=KB/s packin packout insize outsize Peak->Recv Trans formatstring = " Used KB Set Text Data Lib KB Min Maj "; } - CURSE mvwprintw(padtop, 2, 1, formatstring); + CURSE mvwprintw(padtop, 2, 1, "%s", formatstring); for (j = 0; j < max_sorted; j++) { i = topper[j].index; if (!show_all) {