perf tools: Use __maybe_used for unused variables

[deliverable/linux.git] / tools / perf / util / trace-event-parse.c

diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index 0715c843c2e73ad6fc61832854cb33571732a73f..aa4c860a21d1b33a7a7ba27cbe2afe93a676318f 100644 (file)
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -162,25 +162,16 @@ int trace_parse_common_pid(struct pevent *pevent, void *data)
        return pevent_data_pid(pevent, &record);
 }
 
-unsigned long long read_size(struct pevent *pevent, void *ptr, int size)
+unsigned long long read_size(struct event_format *event, void *ptr, int size)
 {
-       return pevent_read_number(pevent, ptr, size);
+       return pevent_read_number(event->pevent, ptr, size);
 }
 
-void print_trace_event(struct pevent *pevent, int cpu, void *data, int size)
+void event_format__print(struct event_format *event,
+                        int cpu, void *data, int size)
 {
-       struct event_format *event;
        struct pevent_record record;
        struct trace_seq s;
-       int type;
-
-       type = trace_parse_common_type(pevent, data);
-
-       event = pevent_find_event(pevent, type);
-       if (!event) {
-               warning("ug! no event found for type %d", type);
-               return;
-       }
 
        memset(&record, 0, sizeof(record));
        record.cpu = cpu;
@@ -192,6 +183,19 @@ void print_trace_event(struct pevent *pevent, int cpu, void *data, int size)
        trace_seq_do_printf(&s);
 }
 
+void print_trace_event(struct pevent *pevent, int cpu, void *data, int size)
+{
+       int type = trace_parse_common_type(pevent, data);
+       struct event_format *event = pevent_find_event(pevent, type);
+
+       if (!event) {
+               warning("ug! no event found for type %d", type);
+               return;
+       }
+
+       event_format__print(event, cpu, data, size);
+}
+
 void print_event(struct pevent *pevent, int cpu, void *data, int size,
                 unsigned long long nsecs, char *comm)
 {
@@ -217,7 +221,7 @@ void print_event(struct pevent *pevent, int cpu, void *data, int size,
 }
 
 void parse_proc_kallsyms(struct pevent *pevent,
-                        char *file, unsigned int size __unused)
+                        char *file, unsigned int size __maybe_unused)
 {
        unsigned long long addr;
        char *func;
@@ -249,7 +253,7 @@ void parse_proc_kallsyms(struct pevent *pevent,
 }
 
 void parse_ftrace_printk(struct pevent *pevent,
-                        char *file, unsigned int size __unused)
+                        char *file, unsigned int size __maybe_unused)
 {
        unsigned long long addr;
        char *printk;
@@ -289,7 +293,7 @@ struct event_format *trace_find_next_event(struct pevent *pevent,
 {
        static int idx;
 
-       if (!pevent->events)
+       if (!pevent || !pevent->events)
                return NULL;
 
        if (!event) {