1 files changed, 11 insertions, 16 deletions

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index c0b70c697a36..2dd5edf161b7 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -31,21 +31,16 @@ static const char **header_argv;
 
 int perf_header__push_event(u64 id, const char *name)
 {
+        struct perf_trace_event_type *nevents;
+
         if (strlen(name) > MAX_EVENT_NAME)
                 pr_warning("Event %s will be truncated\n", name);
 
-        if (!events) {
-                events = malloc(sizeof(struct perf_trace_event_type));
-                if (events == NULL)
-                        return -ENOMEM;
-        } else {
-                struct perf_trace_event_type *nevents;
+        nevents = realloc(events, (event_count + 1) * sizeof(*events));
+        if (nevents == NULL)
+                return -ENOMEM;
+        events = nevents;
 
-                nevents = realloc(events, (event_count + 1) * sizeof(*events));
-                if (nevents == NULL)
-                        return -ENOMEM;
-                events = nevents;
-        }
         memset(&events[event_count], 0, sizeof(struct perf_trace_event_type));
         events[event_count].event_id = id;
         strncpy(events[event_count].name, name, MAX_EVENT_NAME - 1);
@@ -442,7 +437,7 @@ static bool perf_session__read_build_ids(struct perf_session *session, bool with
         return ret;
 }
 
-static int write_trace_info(int fd, struct perf_header *h __used,
+static int write_tracing_data(int fd, struct perf_header *h __used,
                             struct perf_evlist *evlist)
 {
         return read_tracing_data(fd, &evlist->entries);
@@ -1477,7 +1472,7 @@ out:
         return err;
 }
 
-static int process_trace_info(struct perf_file_section *section __unused,
+static int process_tracing_data(struct perf_file_section *section __unused,
                               struct perf_header *ph __unused,
                               int feat __unused, int fd)
 {
@@ -1513,11 +1508,11 @@ struct feature_ops {
                 .full_only = true }
 
 /* feature_ops not implemented: */
-#define print_trace_info                NULL
-#define print_build_id                  NULL
+#define print_tracing_data      NULL
+#define print_build_id          NULL
 
 static const struct feature_ops feat_ops[HEADER_LAST_FEATURE] = {
-        FEAT_OPP(HEADER_TRACE_INFO,     trace_info),
+        FEAT_OPP(HEADER_TRACING_DATA,   tracing_data),
         FEAT_OPP(HEADER_BUILD_ID,       build_id),
         FEAT_OPA(HEADER_HOSTNAME,       hostname),
         FEAT_OPA(HEADER_OSRELEASE,      osrelease),