Rename parse_event_file to pevent_parse_event and remove parse_ftrace_file

Remove all users of parse_ftrace_file, and now use pevent_parse_event().

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

3 files changed, 9 insertions, 15 deletions

diff --git a/parse-events.c b/parse-events.c
index 40b25d4..5f02519 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -3379,7 +3379,7 @@ static void parse_header_field(const char *field,
         free_token(token);
 }
 
-int parse_header_page(char *buf, unsigned long size)
+int pevent_parse_header_page(char *buf, unsigned long size)
 {
         if (!size) {
                 /*
@@ -3404,7 +3404,7 @@ int parse_header_page(char *buf, unsigned long size)
         return 0;
 }
 
-int parse_event_file(char *buf, unsigned long size, char *sys)
+int pevent_parse_event(char *buf, unsigned long size, char *sys)
 {
         struct event *event;
         int ret;
@@ -3488,11 +3488,6 @@ int parse_event_file(char *buf, unsigned long size, char *sys)
         return -1;
 }
 
-int parse_ftrace_file(char *buf, unsigned long size)
-{
-        return parse_event_file(buf, size, "ftrace");
-}
-
 void parse_set_info(int nr_cpus, int long_sz)
 {
         cpus = nr_cpus;
diff --git a/parse-events.h b/parse-events.h
index 8ae56fd..c5db4dc 100644
--- a/parse-events.h
+++ b/parse-events.h
@@ -222,9 +222,6 @@ void parse_cmdlines(char *file, int size);
 void parse_proc_kallsyms(char *file, unsigned int size);
 void parse_ftrace_printk(char *file, unsigned int size);
 
-int parse_ftrace_file(char *buf, unsigned long size);
-int parse_event_file(char *buf, unsigned long size, char *sys);
-
 extern int file_bigendian;
 extern int host_bigendian;
 
@@ -290,8 +287,6 @@ extern int header_page_data_size;
 
 extern int latency_format;
 
-int parse_header_page(char *buf, unsigned long size);
-
 /* taken from kernel/trace/trace.h */
 enum trace_flag_type {
         TRACE_FLAG_IRQS_OFF             = 0x01,
@@ -308,6 +303,10 @@ int pevent_register_print_string(char *fmt, unsigned long long addr);
 void pevent_print_event(struct trace_seq *s,
                         int cpu, void *data, int size, unsigned long long nsecs);
 
+int pevent_parse_header_page(char *buf, unsigned long size);
+
+int pevent_parse_event(char *buf, unsigned long size, char *sys);
+
 /* for debugging */
 void pevent_print_funcs(void);
 void pevent_print_printk(void);
diff --git a/trace-read.c b/trace-read.c
index a57d02f..355a811 100644
--- a/trace-read.c
+++ b/trace-read.c
@@ -184,7 +184,7 @@ static void read_header_files(void)
         size = read8();
         header_page = malloc_or_die(size);
         read_or_die(header_page, size);
-        parse_header_page(header_page, size);
+        pevent_parse_header_page(header_page, size);
         free(header_page);
 
         /*
@@ -209,7 +209,7 @@ static void read_ftrace_file(unsigned long long size)
 
         buf = malloc_or_die(size);
         read_or_die(buf, size);
-        parse_ftrace_file(buf, size);
+        pevent_parse_event(buf, size, "ftrace");
         free(buf);
 }
 
@@ -222,7 +222,7 @@ static void read_event_file(char *system, unsigned long long size)
         buf[size] = 0;
         if (show_events)
                 printf("%s\n", buf);
-        parse_event_file(buf, size, system);
+        pevent_parse_event(buf, size, system);
         free(buf);
 }