Skip to content

Commit 27f94d5

Browse files
committed
tools lib traceevent: Use 'const' in variables pointing to const strings
Fixing the build on fedora 14, 32-bit: tools/lib/traceevent/event-parse.c: In function ‘find_cmdline’: tools/lib/traceevent/event-parse.c:183:3: error: return discards qualifiers from pointer target type tools/lib/traceevent/event-parse.c:186:3: error: return discards qualifiers from pointer target type tools/lib/traceevent/event-parse.c:195:2: error: return discards qualifiers from pointer target type tools/lib/traceevent/event-parse.c: In function ‘process_func_handler’: tools/lib/traceevent/event-parse.c:2658:9: error: assignment discards qualifiers from pointer target type tools/lib/traceevent/event-parse.c:2660:9: error: assignment discards qualifiers from pointer target type tools/lib/traceevent/event-parse.c: In function ‘print_mac_arg’: tools/lib/traceevent/event-parse.c:3892:14: error: initialization discards qualifiers from pointer target type tools/lib/traceevent/event-parse.c:3906:7: error: assignment discards qualifiers from pointer target type tools/lib/traceevent/event-parse.c: In function ‘pevent_print_event’: tools/lib/traceevent/event-parse.c:4412:24: error: initialization discards qualifiers from pointer target type Cc: David Ahern <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Mike Galbraith <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Cc: Steven Rostedt <[email protected]> Link: http://lkml.kernel.org/n/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 7a90561 commit 27f94d5

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tools/lib/traceevent/event-parse.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ static int cmdline_init(struct pevent *pevent)
174174
return 0;
175175
}
176176

177-
static char *find_cmdline(struct pevent *pevent, int pid)
177+
static const char *find_cmdline(struct pevent *pevent, int pid)
178178
{
179179
const struct cmdline *comm;
180180
struct cmdline key;
@@ -2637,7 +2637,7 @@ process_func_handler(struct event_format *event, struct pevent_function_handler
26372637
struct print_arg *farg;
26382638
enum event_type type;
26392639
char *token;
2640-
char *test;
2640+
const char *test;
26412641
int i;
26422642

26432643
arg->type = PRINT_FUNC;
@@ -3889,7 +3889,7 @@ static void print_mac_arg(struct trace_seq *s, int mac, void *data, int size,
38893889
struct event_format *event, struct print_arg *arg)
38903890
{
38913891
unsigned char *buf;
3892-
char *fmt = "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x";
3892+
const char *fmt = "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x";
38933893

38943894
if (arg->type == PRINT_FUNC) {
38953895
process_defined_func(s, data, size, event, arg);
@@ -4409,7 +4409,7 @@ void pevent_event_info(struct trace_seq *s, struct event_format *event,
44094409
void pevent_print_event(struct pevent *pevent, struct trace_seq *s,
44104410
struct pevent_record *record)
44114411
{
4412-
static char *spaces = " "; /* 20 spaces */
4412+
static const char *spaces = " "; /* 20 spaces */
44134413
struct event_format *event;
44144414
unsigned long secs;
44154415
unsigned long usecs;

0 commit comments

Comments
 (0)