dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

perf tui: Add workaround for slang < 2.1.4 

Older versions of the slang library didn't used the 'const' specifier,
causing problems with modern compilers of this kind:

util/newt.c:252: error: passing argument 1 of ‘SLsmg_printf’ discards
qualifiers from pointer target type

Fix it by using some wrappers that when needed const the affected
parameters back to plain (char *).

Reported-by: Lin Ming <ming.m.lin@intel.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Lin Ming <ming.m.lin@intel.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <20100517145421.GD29052@ghostprotocols.net>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2010-05-17 12:25:09 -03:00
parent 3de29cab1f
commit dc4ff19341
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tools/perf/util/newt.c
View File

@ -14,6 +14,17 @@
#include "sort.h" #include "sort.h"
#include "symbol.h" #include "symbol.h"
#if SLANG_VERSION < 20104
#define slsmg_printf(msg, args...) SLsmg_printf((char *)msg, ##args)
#define slsmg_write_nstring(msg, len) SLsmg_write_nstring((char *)msg, len)
#define sltt_set_color(obj, name, fg, bg) SLtt_set_color(obj,(char *)name,\
(char *)fg, (char *)bg)
#else
#define slsmg_printf SLsmg_printf
#define slsmg_write_nstring SLsmg_write_nstring
#define sltt_set_color SLtt_set_color
#endif
struct ui_progress { struct ui_progress {
newtComponent form, scale; newtComponent form, scale;
}; };
@ -292,21 +303,21 @@ static int objdump_line__show(struct objdump_line *self, struct list_head *head,
color = ui_browser__percent_color(percent, current_entry); color = ui_browser__percent_color(percent, current_entry);
SLsmg_set_color(color); SLsmg_set_color(color);
SLsmg_printf(" %7.2f ", percent); slsmg_printf(" %7.2f ", percent);
if (!current_entry) if (!current_entry)
SLsmg_set_color(HE_COLORSET_CODE); SLsmg_set_color(HE_COLORSET_CODE);
} else { } else {
int color = ui_browser__percent_color(0, current_entry); int color = ui_browser__percent_color(0, current_entry);
SLsmg_set_color(color); SLsmg_set_color(color);
SLsmg_write_nstring(" ", 9); slsmg_write_nstring(" ", 9);
} }
SLsmg_write_char(':'); SLsmg_write_char(':');
SLsmg_write_nstring(" ", 8); slsmg_write_nstring(" ", 8);
if (!*self->line) if (!*self->line)
SLsmg_write_nstring(" ", width - 18); slsmg_write_nstring(" ", width - 18);
else else
SLsmg_write_nstring(self->line, width - 18); slsmg_write_nstring(self->line, width - 18);
return 0; return 0;
} }
@ -1054,11 +1065,11 @@ void setup_browser(void)
newtInit(); newtInit();
newtCls(); newtCls();
ui_helpline__puts(" "); ui_helpline__puts(" ");
SLtt_set_color(HE_COLORSET_TOP, NULL, c->topColorFg, c->topColorBg); sltt_set_color(HE_COLORSET_TOP, NULL, c->topColorFg, c->topColorBg);
SLtt_set_color(HE_COLORSET_MEDIUM, NULL, c->mediumColorFg, c->mediumColorBg); sltt_set_color(HE_COLORSET_MEDIUM, NULL, c->mediumColorFg, c->mediumColorBg);
SLtt_set_color(HE_COLORSET_NORMAL, NULL, c->normalColorFg, c->normalColorBg); sltt_set_color(HE_COLORSET_NORMAL, NULL, c->normalColorFg, c->normalColorBg);
SLtt_set_color(HE_COLORSET_SELECTED, NULL, c->selColorFg, c->selColorBg); sltt_set_color(HE_COLORSET_SELECTED, NULL, c->selColorFg, c->selColorBg);
SLtt_set_color(HE_COLORSET_CODE, NULL, c->codeColorFg, c->codeColorBg); sltt_set_color(HE_COLORSET_CODE, NULL, c->codeColorFg, c->codeColorBg);
} }
void exit_browser(bool wait_for_ok) void exit_browser(bool wait_for_ok)