Add free_record() to use to free records read

This adds a wrapper for freeing the records.

It also fixes a comment in tracecmd_peek_data, where
the record returned must not be freed.

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

3 files changed, 13 insertions, 8 deletions

diff --git a/trace-cmd.h b/trace-cmd.h
index e67cdef..d6e4db0 100644
--- a/trace-cmd.h
+++ b/trace-cmd.h
@@ -36,6 +36,11 @@ struct record {
         void *data;
 };
 
+static inline void free_record(struct record *record)
+{
+        free(record);
+}
+
 struct tracecmd_input;
 struct tracecmd_output;
 struct tracecmd_recorder;
diff --git a/trace-input.c b/trace-input.c
index 3889f66..d6fc93e 100644
--- a/trace-input.c
+++ b/trace-input.c
@@ -734,10 +734,10 @@ read_event(struct tracecmd_input *handle, unsigned long long offset,
 
         do {
                 if (record)
-                        free(record);
+                        free_record(record);
                 /* Make sure peek returns new data */
                 if (handle->cpu_data[cpu].next) {
-                        free(handle->cpu_data[cpu].next);
+                        free_record(handle->cpu_data[cpu].next);
                         handle->cpu_data[cpu].next = NULL;
                 }
                 record = tracecmd_read_data(handle, cpu);
@@ -1054,7 +1054,7 @@ tracecmd_translate_data(struct tracecmd_input *handle,
  * This returns the record at the current location of the CPU
  * iterator. It does not increment the CPU iterator.
  *
- * The record returned must be freed.
+ * NOTE: Do not free the record returned, it is stored in the @handle.
  */
 struct record *
 tracecmd_peek_data(struct tracecmd_input *handle, int cpu)
diff --git a/trace-read.c b/trace-read.c
index da5b0bf..b6b233c 100644
--- a/trace-read.c
+++ b/trace-read.c
@@ -72,7 +72,7 @@ static void show_test(struct tracecmd_input *handle)
         trace_seq_do_printf(&s);
         printf("\n");
 
-        free(record);
+        free_record(record);
 }
 
 static void test_save(struct record *record, int cpu)
@@ -118,7 +118,7 @@ static void show_test(struct tracecmd_input *handle)
         trace_seq_do_printf(&s);
         printf("\n");
 
-        free(record);
+        free_record(record);
 }
 
 static void test_save(struct record *record, int cpu)
@@ -158,7 +158,7 @@ static void show_test(struct tracecmd_input *handle)
         trace_seq_do_printf(&s);
         printf("\n");
 
-        free(record);
+        free_record(record);
 
         record = tracecmd_read_cpu_last(handle, cpu);
         if (!record) {
@@ -173,7 +173,7 @@ static void show_test(struct tracecmd_input *handle)
         trace_seq_do_printf(&s);
         printf("\n");
 
-        free(record);
+        free_record(record);
 }
 static void test_save(struct record *record, int cpu)
 {
@@ -206,7 +206,7 @@ static void show_data(struct tracecmd_input *handle, int cpu)
         trace_seq_do_printf(&s);
         printf("\n");
 
-        free(record);
+        free_record(record);
 }
 
 static void read_rest(void)