tools lib traceevent: Use 'const' in variables pointing to const strings
Commit-ID: 27f94d52394003d444a383eaf8d4824daf32432e Gitweb: http://git.kernel.org/tip/27f94d52394003d444a383eaf8d4824daf32432e Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Fri, 9 Nov 2012 17:40:47 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 9 Nov 2012 17:42:47 -0300
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
--- tools/lib/traceevent/event-parse.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
tools/lib/traceevent/event-parse.c +4 -4
@@ -174,7 +174,7 @@ static int cmdline_init(struct pevent *pevent)return 0 ; } -static char *find_cmdline (struct pevent *pevent,int pid) +static const char *find_cmdline (struct pevent *pevent,int pid) {const struct cmdline *comm;struct cmdline key;
@@ -2637,7 +2637,7 @@ process_func_handler(struct event_format *event, struct pevent_function_handlerstruct print_arg *farg;enum event_type type;char *token; -char *test; +const char *test;int i; arg->type =PRINT_FUNC ;
@@ -3889,7 +3889,7 @@ static void print_mac_arg(struct trace_seq *s, int mac, void *data, int size, struct event_format *event, struct print_arg *arg) { unsigned char *buf; -char *fmt ="%.2x:%.2x:%.2x:%.2x:%.2x:%.2x" ; +const char *fmt ="%.2x:%.2x:%.2x:%.2x:%.2x:%.2x" ;if (arg->type ==PRINT_FUNC ) {process_defined_func (s, data, size, event, arg);
@@ -4409,7 +4409,7 @@ void pevent_event_info(struct trace_seq *s, struct event_format *event,void pevent_print_event (struct pevent *pevent,struct trace_seq *s,struct pevent_record *record) { -static char *spaces =" " ;/* 20 spaces */ +static const char *spaces =" " ;/* 20 spaces */ struct event_format *event;unsigned long secs;unsigned long usecs;