Merge branch 'master' of git://git.fedorahosted.org/git/abrt

3 files changed, 10 insertions, 17 deletions

diff --git a/src/include/abrt_problem_data.h b/src/include/abrt_problem_data.h
index 795c2404..2fa540e3 100644
--- a/src/include/abrt_problem_data.h
+++ b/src/include/abrt_problem_data.h
@@ -58,6 +58,9 @@
 // Optional. Set to "1" by abrt-handle-upload for every unpacked dump
 #define FILENAME_REMOTE       "remote"
 #define FILENAME_TAINTED      "kernel_tainted"
+#define FILENAME_TAINTED_SHORT "kernel_tainted_short"
+#define FILENAME_TAINTED_LONG  "kernel_tainted_long"
+// TODO: TicketUploader also has open-coded "TICKET", "CUSTOMER" files
 
 #define FILENAME_UUID         "uuid"
 #define FILENAME_COUNT        "count"
diff --git a/src/include/abrtlib.h b/src/include/abrtlib.h
index 294afdda..5d03ee49 100644
--- a/src/include/abrtlib.h
+++ b/src/include/abrtlib.h
@@ -283,6 +283,12 @@ bool load_conf_file(const char *pPath, map_string_h *settings, bool skipKeysWith
 #define steal_directory abrt_steal_directory
 struct dump_dir *steal_directory(const char *base_dir, const char *dump_dir_name);
 
+#define kernel_tainted_short abrt_kernel_tainted_short
+char *kernel_tainted_short(unsigned tainted);
+
+#define kernel_tainted_long abrt_kernel_tainted_long
+GList *kernel_tainted_long(unsigned tainted);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/include/report/problem_data.h b/src/include/report/problem_data.h
index c805c37a..f7178077 100644
--- a/src/include/report/problem_data.h
+++ b/src/include/report/problem_data.h
@@ -45,6 +45,7 @@ typedef struct problem_item problem_item;
 
 char *format_problem_item(struct problem_item *item);
 
+
 /* In-memory problem data structure and accessors */
 
 typedef GHashTable problem_data_t;
@@ -77,23 +78,6 @@ const char *get_problem_item_content_or_NULL(problem_data_t *problem_data, const
 const char *get_problem_item_content_or_die(problem_data_t *problem_data, const char *key);
 
 
-/* Vector of these structures */
-
-typedef GPtrArray vector_of_problem_data_t;
-
-static inline problem_data_t *get_problem_data(vector_of_problem_data_t *vector, unsigned i)
-{
-    return (problem_data_t *)g_ptr_array_index(vector, i);
-}
-
-vector_of_problem_data_t *new_vector_of_problem_data(void);
-static inline void free_vector_of_problem_data(vector_of_problem_data_t *vector)
-{
-    if (vector)
-        g_ptr_array_free(vector, TRUE);
-}
-
-
 /* Conversions between in-memory and on-disk formats */
 
 void load_problem_data_from_dump_dir(problem_data_t *problem_data, struct dump_dir *dd);