[SATYR PATCH 1/9] Move koops taint flags declaration to private header

Martin Milata mmilata at redhat.com
Wed Jun 26 20:14:05 UTC 2013


Signed-off-by: Martin Milata <mmilata at redhat.com>
---
 include/koops/stacktrace.h   |  9 ---------
 lib/internal_utils.h         | 10 ++++++++++
 python/py_koops_stacktrace.c |  1 +
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/include/koops/stacktrace.h b/include/koops/stacktrace.h
index 580610f..4aa545e 100644
--- a/include/koops/stacktrace.h
+++ b/include/koops/stacktrace.h
@@ -160,15 +160,6 @@ char *
 sr_koops_stacktrace_to_json(struct sr_koops_stacktrace *stacktrace);
 
 
-/* TODO: this needs to go in a _private_ header and should not be exported */
-struct sr_taint_flag
-{
-    char letter;
-    size_t member_offset;
-    char *name;
-};
-extern struct sr_taint_flag sr_flags[];
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/internal_utils.h b/lib/internal_utils.h
index 2236f58..7a2d2cf 100644
--- a/lib/internal_utils.h
+++ b/lib/internal_utils.h
@@ -18,6 +18,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include <stddef.h>
 #include <assert.h>
 
 #define DISPATCH(table, type, method) \
@@ -43,3 +44,12 @@
 
 /* beware the side effects */
 #define OR_UNKNOWN(s) ((s) ? (s) : "<unknown>")
+
+/* kerneloops taint flag structure and global table declaration */
+struct sr_taint_flag
+{
+    char letter;
+    size_t member_offset;
+    char *name;
+};
+extern struct sr_taint_flag sr_flags[];
diff --git a/python/py_koops_stacktrace.c b/python/py_koops_stacktrace.c
index 97a38ef..c748721 100644
--- a/python/py_koops_stacktrace.c
+++ b/python/py_koops_stacktrace.c
@@ -8,6 +8,7 @@
 #include "location.h"
 #include "normalize.h"
 #include "stacktrace.h"
+#include "internal_utils.h"
 
 #define stacktrace_doc "satyr.Kerneloops - class representing a kerneloops stacktrace\n" \
                       "Usage:\n" \
-- 
1.7.11.7



More information about the Crash-catcher mailing list