summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2010-11-06 11:47:24 +0300
committerIngo Molnar <mingo@elte.hu>2010-11-10 09:04:32 +0100
commita3da8e451321c31d88cebd12c234d0aac2a1cc35 (patch)
treebb9ebc34ecaaf6a18b54a3c874a02403a8a107c9 /tools
parentf6614b7bb405a9b35dd28baea989a749492c46b2 (diff)
downloadlinux-3.10-a3da8e451321c31d88cebd12c234d0aac2a1cc35.tar.gz
linux-3.10-a3da8e451321c31d88cebd12c234d0aac2a1cc35.tar.bz2
linux-3.10-a3da8e451321c31d88cebd12c234d0aac2a1cc35.zip
perf, ui: Eliminate stack-smashing protection compiler complaint
The gcc complains about small auto-var strings being allocated from stack space. Make them const to avoid this: | CC util/ui/util.o | cc1: warnings being treated as errors | util/ui/util.c: In function ‘ui__dialog_yesno’: | util/ui/util.c:108: error: not protecting function: no buffer at least 8 bytes long | make: *** [util/ui/util.o] Error 1 The real bug is in the newtWinChoice() ABI - but that's an externality we cannot fix here, so we use this workaround. Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> Acked-by: Frédéric Weisbecker <fweisbec@gmail.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> LKML-Reference: <20101106084724.GA5956@lenovo> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/ui/util.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/perf/util/ui/util.c b/tools/perf/util/ui/util.c
index 9706d9d4027..056c69521a3 100644
--- a/tools/perf/util/ui/util.c
+++ b/tools/perf/util/ui/util.c
@@ -104,9 +104,10 @@ out_destroy_form:
return rc;
}
+static const char yes[] = "Yes", no[] = "No";
+
bool ui__dialog_yesno(const char *msg)
{
/* newtWinChoice should really be accepting const char pointers... */
- char yes[] = "Yes", no[] = "No";
- return newtWinChoice(NULL, yes, no, (char *)msg) == 1;
+ return newtWinChoice(NULL, (char *)yes, (char *)no, (char *)msg) == 1;
}