Move trace-seq header into parse-events.h

The functions for trace-seq are moving into the parse-events library.
We need to keep the headers more consolidated.

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

5 files changed, 43 insertions, 45 deletions

diff --git a/Makefile b/Makefile
index c4c1107..fcd1443 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ all: $(TARGETS)
 
 trace-read.o::          parse-events.h
 trace-cmd.o::           parse-events.h
-trace-seq.o::           parse-events.h trace-seq.h
+trace-seq.o::           parse-events.h
 
 trace-cmd:: trace-cmd.o trace-read.o trace-seq.o
         $(CC) $^ -o $@ $(LIBS)
diff --git a/parse-events.c b/parse-events.c
index 964b7c1..46eaf08 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -29,7 +29,6 @@
 #include <errno.h>
 
 #include "parse-events.h"
-#include "trace-seq.h"
 
 int header_page_ts_offset;
 int header_page_ts_size;
diff --git a/parse-events.h b/parse-events.h
index beee837..847d87e 100644
--- a/parse-events.h
+++ b/parse-events.h
@@ -5,7 +5,43 @@
 #define __unused __attribute__ ((unused))
 #endif
 
-#include "trace-seq.h"
+/* ----------------------- trace_seq ----------------------- */
+
+
+#ifndef TRACE_SEQ_SIZE
+#define TRACE_SEQ_SIZE 4096
+#endif
+
+/*
+ * Trace sequences are used to allow a function to call several other functions
+ * to create a string of data to use (up to a max of PAGE_SIZE).
+ */
+
+struct trace_seq {
+        char                    buffer[TRACE_SEQ_SIZE];
+        unsigned int            len;
+        unsigned int            readpos;
+};
+
+static inline void
+trace_seq_init(struct trace_seq *s)
+{
+        s->len = 0;
+        s->readpos = 0;
+}
+
+extern int trace_seq_printf(struct trace_seq *s, const char *fmt, ...)
+        __attribute__ ((format (printf, 2, 3)));
+extern int trace_seq_vprintf(struct trace_seq *s, const char *fmt, va_list args)
+        __attribute__ ((format (printf, 2, 0)));
+
+extern int trace_seq_puts(struct trace_seq *s, const char *str);
+extern int trace_seq_putc(struct trace_seq *s, unsigned char c);
+
+extern int trace_seq_do_printf(struct trace_seq *s);
+
+
+/* ----------------------- pevent ----------------------- */
 
 /* unique to trace-cmd */
 extern unsigned int page_size;
diff --git a/trace-seq.c b/trace-seq.c
index dc18893..3e3e059 100644
--- a/trace-seq.c
+++ b/trace-seq.c
@@ -10,7 +10,6 @@
 #include <stdarg.h>
 
 #include "parse-events.h"
-#include "trace-seq.h"
 
 /**
  * trace_seq_printf - sequence printing of trace information
@@ -29,7 +28,7 @@
 int
 trace_seq_printf(struct trace_seq *s, const char *fmt, ...)
 {
-        int len = (PAGE_SIZE - 1) - s->len;
+        int len = (TRACE_SEQ_SIZE - 1) - s->len;
         va_list ap;
         int ret;
 
@@ -63,7 +62,7 @@ trace_seq_printf(struct trace_seq *s, const char *fmt, ...)
 int
 trace_seq_vprintf(struct trace_seq *s, const char *fmt, va_list args)
 {
-        int len = (PAGE_SIZE - 1) - s->len;
+        int len = (TRACE_SEQ_SIZE - 1) - s->len;
         int ret;
 
         if (!len)
@@ -94,7 +93,7 @@ int trace_seq_puts(struct trace_seq *s, const char *str)
 {
         int len = strlen(str);
 
-        if (len > ((PAGE_SIZE - 1) - s->len))
+        if (len > ((TRACE_SEQ_SIZE - 1) - s->len))
                 return 0;
 
         memcpy(s->buffer + s->len, str, len);
@@ -105,7 +104,7 @@ int trace_seq_puts(struct trace_seq *s, const char *str)
 
 int trace_seq_putc(struct trace_seq *s, unsigned char c)
 {
-        if (s->len >= (PAGE_SIZE - 1))
+        if (s->len >= (TRACE_SEQ_SIZE - 1))
                 return 0;
 
         s->buffer[s->len++] = c;
@@ -121,7 +120,7 @@ int trace_seq_do_printf(struct trace_seq *s)
         if (!s->len)
                 return 0;
 
-        if (s->len < PAGE_SIZE) {
+        if (s->len < TRACE_SEQ_SIZE) {
                 s->buffer[s->len] = 0;
                 return printf("%s", s->buffer);
         }
diff --git a/trace-seq.h b/trace-seq.h
deleted file mode 100644
index 4bacc86..0000000
--- a/trace-seq.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef _TRACE_SEQ_H
-#define _TRACE_SEQ_H
-
-#ifndef PAGE_SIZE
-#define PAGE_SIZE 4096
-#endif
-
-/*
- * Trace sequences are used to allow a function to call several other functions
- * to create a string of data to use (up to a max of PAGE_SIZE).
- */
-
-struct trace_seq {
-        char                    buffer[PAGE_SIZE];
-        unsigned int            len;
-        unsigned int            readpos;
-};
-
-static inline void
-trace_seq_init(struct trace_seq *s)
-{
-        s->len = 0;
-        s->readpos = 0;
-}
-
-extern int trace_seq_printf(struct trace_seq *s, const char *fmt, ...)
-        __attribute__ ((format (printf, 2, 3)));
-extern int trace_seq_vprintf(struct trace_seq *s, const char *fmt, va_list args)
-        __attribute__ ((format (printf, 2, 0)));
-
-extern int trace_seq_puts(struct trace_seq *s, const char *str);
-extern int trace_seq_putc(struct trace_seq *s, unsigned char c);
-
-extern int trace_seq_do_printf(struct trace_seq *s);
-
-#endif /* _TRACE_SEQ_H */