mass replace of crash_data with problem_data

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

6 files changed, 50 insertions, 50 deletions

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index decfeffd..f2b97749 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -36,7 +36,7 @@ libreport_la_SOURCES = \
     load_plugin_settings.c \
     make_descr.c \
     run_event.c \
-    crash_data.c \
+    problem_data.c \
     create_dump_dir.c \
     abrt_types.c \
     hooklib.c hooklib.h \
diff --git a/src/lib/create_dump_dir.c b/src/lib/create_dump_dir.c
index 50893f05..9839a96c 100644
--- a/src/lib/create_dump_dir.c
+++ b/src/lib/create_dump_dir.c
@@ -29,7 +29,7 @@ static struct dump_dir *try_dd_create(const char *base_dir_name, const char *dir
     return dd;
 }
 
-struct dump_dir *create_dump_dir_from_crash_data(crash_data_t *crash_data, const char *base_dir_name)
+struct dump_dir *create_dump_dir_from_problem_data(problem_data_t *problem_data, const char *base_dir_name)
 {
     char dir_name[sizeof("abrt-tmp-YYYY-MM-DD-HH:MM:SS-%lu") + sizeof(long)*3];
     sprintf(dir_name, "abrt-tmp-%s-%lu", iso_date_string(NULL), (long)getpid());
@@ -63,13 +63,13 @@ struct dump_dir *create_dump_dir_from_crash_data(crash_data_t *crash_data, const
 
     GHashTableIter iter;
     char *name;
-    struct crash_item *value;
-    g_hash_table_iter_init(&iter, crash_data);
+    struct problem_item *value;
+    g_hash_table_iter_init(&iter, problem_data);
     while (g_hash_table_iter_next(&iter, (void**)&name, (void**)&value))
     {
         if (name[0] == '.' || strchr(name, '/'))
         {
-            error_msg("Crash data field name contains disallowed chars: '%s'", name);
+            error_msg("Problem data field name contains disallowed chars: '%s'", name);
             goto next;
         }
 
diff --git a/src/lib/dump_dir.c b/src/lib/dump_dir.c
index 464df5c9..0c6467f4 100644
--- a/src/lib/dump_dir.c
+++ b/src/lib/dump_dir.c
@@ -315,7 +315,7 @@ struct dump_dir *dd_opendir(const char *dir, int flags)
              * directory when run without arguments, because its option -d DIR
              * defaults to "."!
              */
-            error_msg("'%s' is not a crash dump directory", dir);
+            error_msg("'%s' is not a dump directory", dir);
         }
         else if (errno == ENOENT || errno == ENOTDIR)
         {
diff --git a/src/lib/make_descr.c b/src/lib/make_descr.c
index c5b4bd6c..35f4e9dc 100644
--- a/src/lib/make_descr.c
+++ b/src/lib/make_descr.c
@@ -68,7 +68,7 @@ static const char *const blacklisted_items[] = {
     NULL
 };
 
-char* make_description_mailx(crash_data_t *crash_data)
+char* make_description_mailx(problem_data_t *problem_data)
 {
     struct strbuf *buf_dsc = strbuf_new();
     struct strbuf *buf_additional_files = strbuf_new();
@@ -77,8 +77,8 @@ char* make_description_mailx(crash_data_t *crash_data)
 
     GHashTableIter iter;
     char *name;
-    struct crash_item *value;
-    g_hash_table_iter_init(&iter, crash_data);
+    struct problem_item *value;
+    g_hash_table_iter_init(&iter, problem_data);
     while (g_hash_table_iter_next(&iter, (void**)&name, (void**)&value))
     {
         if (value->flags & CD_FLAG_TXT)
@@ -112,7 +112,7 @@ char* make_description_mailx(crash_data_t *crash_data)
     return strbuf_free_nobuf(buf_dsc);
 }
 
-char* make_description_bz(crash_data_t *crash_data)
+char* make_description_bz(problem_data_t *problem_data)
 {
     struct strbuf *buf_dsc = strbuf_new();
     struct strbuf *buf_big_dsc = strbuf_new();
@@ -120,8 +120,8 @@ char* make_description_bz(crash_data_t *crash_data)
 
     GHashTableIter iter;
     char *name;
-    struct crash_item *value;
-    g_hash_table_iter_init(&iter, crash_data);
+    struct problem_item *value;
+    g_hash_table_iter_init(&iter, problem_data);
     while (g_hash_table_iter_next(&iter, (void**)&name, (void**)&value))
     {
         struct stat statbuf;
@@ -200,15 +200,15 @@ char* make_description_bz(crash_data_t *crash_data)
     return strbuf_free_nobuf(buf_dsc);
 }
 
-char* make_description_logger(crash_data_t *crash_data)
+char* make_description_logger(problem_data_t *problem_data)
 {
     struct strbuf *buf_dsc = strbuf_new();
     struct strbuf *buf_long_dsc = strbuf_new();
 
     GHashTableIter iter;
     char *name;
-    struct crash_item *value;
-    g_hash_table_iter_init(&iter, crash_data);
+    struct problem_item *value;
+    g_hash_table_iter_init(&iter, problem_data);
     while (g_hash_table_iter_next(&iter, (void**)&name, (void**)&value))
     {
         const char *content = value->content;
@@ -251,12 +251,12 @@ char* make_description_logger(crash_data_t *crash_data)
     return strbuf_free_nobuf(buf_dsc);
 }
 
-char* make_description_comment(crash_data_t *crash_data)
+char* make_description_comment(problem_data_t *problem_data)
 {
     char *comment = NULL;
-    struct crash_item *value;
+    struct problem_item *value;
 
-    value = get_crash_data_item_or_NULL(crash_data, FILENAME_COMMENT);
+    value = get_problem_data_item_or_NULL(problem_data, FILENAME_COMMENT);
     if (value)
     {
         if (value->content[0])
diff --git a/src/lib/crash_data.c b/src/lib/problem_data.c
index 81513388..63db70db 100644
--- a/src/lib/crash_data.c
+++ b/src/lib/problem_data.c
@@ -18,17 +18,17 @@
 */
 #include "abrtlib.h"
 
-static void free_crash_item(void *ptr)
+static void free_problem_item(void *ptr)
 {
     if (ptr)
     {
-        struct crash_item *item = (struct crash_item *)ptr;
+        struct problem_item *item = (struct problem_item *)ptr;
         free(item->content);
         free(item);
     }
 }
 
-char *format_crash_item(struct crash_item *item)
+char *format_problem_item(struct problem_item *item)
 {
     if (!item)
         return xstrdup("(nullitem)");
@@ -49,15 +49,15 @@ char *format_crash_item(struct crash_item *item)
     return NULL;
 }
 
-/* crash_data["name"] = { "content", CD_FLAG_foo_bits } */
+/* problem_data["name"] = { "content", CD_FLAG_foo_bits } */
 
-crash_data_t *new_crash_data(void)
+problem_data_t *new_problem_data(void)
 {
     return g_hash_table_new_full(g_str_hash, g_str_equal,
-                 free, free_crash_item);
+                 free, free_problem_item);
 }
 
-void add_to_crash_data_ext(crash_data_t *crash_data,
+void add_to_problem_data_ext(problem_data_t *problem_data,
                 const char *name,
                 const char *content,
                 unsigned flags)
@@ -67,41 +67,41 @@ void add_to_crash_data_ext(crash_data_t *crash_data,
     if (!(flags & CD_FLAG_ISEDITABLE))
         flags |= CD_FLAG_ISNOTEDITABLE;
 
-    struct crash_item *item = (struct crash_item *)xzalloc(sizeof(*item));
+    struct problem_item *item = (struct problem_item *)xzalloc(sizeof(*item));
     item->content = xstrdup(content);
     item->flags = flags;
-    g_hash_table_replace(crash_data, xstrdup(name), item);
+    g_hash_table_replace(problem_data, xstrdup(name), item);
 }
 
-void add_to_crash_data(crash_data_t *crash_data,
+void add_to_problem_data(problem_data_t *problem_data,
                 const char *name,
                 const char *content)
 {
-    add_to_crash_data_ext(crash_data, name, content, CD_FLAG_TXT + CD_FLAG_ISNOTEDITABLE);
+    add_to_problem_data_ext(problem_data, name, content, CD_FLAG_TXT + CD_FLAG_ISNOTEDITABLE);
 }
 
-const char *get_crash_item_content_or_die(crash_data_t *crash_data, const char *key)
+const char *get_problem_item_content_or_die(problem_data_t *problem_data, const char *key)
 {
-    struct crash_item *item = get_crash_data_item_or_NULL(crash_data, key);
+    struct problem_item *item = get_problem_data_item_or_NULL(problem_data, key);
     if (!item)
-        error_msg_and_die("Error accessing crash data: no ['%s']", key);
+        error_msg_and_die("Error accessing problem data: no ['%s']", key);
     return item->content;
 }
 
-const char *get_crash_item_content_or_NULL(crash_data_t *crash_data, const char *key)
+const char *get_problem_item_content_or_NULL(problem_data_t *problem_data, const char *key)
 {
-    struct crash_item *item = get_crash_data_item_or_NULL(crash_data, key);
+    struct problem_item *item = get_problem_data_item_or_NULL(problem_data, key);
     if (!item)
         return NULL;
     return item->content;
 }
 
 
-/* crash_data_vector[i] = { "name" = { "content", CD_FLAG_foo_bits } } */
+/* problem_data_vector[i] = { "name" = { "content", CD_FLAG_foo_bits } } */
 
-vector_of_crash_data_t *new_vector_of_crash_data(void)
+vector_of_problem_data_t *new_vector_of_problem_data(void)
 {
-    return g_ptr_array_new_with_free_func((void (*)(void*)) &free_crash_data);
+    return g_ptr_array_new_with_free_func((void (*)(void*)) &free_problem_data);
 }
 
 
@@ -209,7 +209,7 @@ static char* is_text_file(const char *name, ssize_t *sz)
     return NULL; /* it's binary */
 }
 
-void load_crash_data_from_dump_dir(crash_data_t *crash_data, struct dump_dir *dd)
+void load_problem_data_from_dump_dir(problem_data_t *problem_data, struct dump_dir *dd)
 {
     char *short_name;
     char *full_name;
@@ -226,7 +226,7 @@ void load_crash_data_from_dump_dir(crash_data_t *crash_data, struct dump_dir *dd
             text = is_text_file(full_name, &sz);
             if (!text)
             {
-                add_to_crash_data_ext(crash_data,
+                add_to_problem_data_ext(problem_data,
                         short_name,
                         full_name,
                         CD_FLAG_BIN + CD_FLAG_ISNOTEDITABLE
@@ -274,7 +274,7 @@ void load_crash_data_from_dump_dir(crash_data_t *crash_data, struct dump_dir *dd
         if (strcmp(short_name, FILENAME_TIME) == 0)
             flags |= CD_FLAG_UNIXTIME;
 
-        add_to_crash_data_ext(crash_data,
+        add_to_problem_data_ext(problem_data,
                 short_name,
                 content,
                 flags
@@ -285,19 +285,19 @@ void load_crash_data_from_dump_dir(crash_data_t *crash_data, struct dump_dir *dd
     }
 }
 
-crash_data_t *create_crash_data_from_dump_dir(struct dump_dir *dd)
+problem_data_t *create_problem_data_from_dump_dir(struct dump_dir *dd)
 {
-    crash_data_t *crash_data = new_crash_data();
-    load_crash_data_from_dump_dir(crash_data, dd);
-    return crash_data;
+    problem_data_t *problem_data = new_problem_data();
+    load_problem_data_from_dump_dir(problem_data, dd);
+    return problem_data;
 }
 
-void log_crash_data(crash_data_t *crash_data, const char *pfx)
+void log_problem_data(problem_data_t *problem_data, const char *pfx)
 {
     GHashTableIter iter;
     char *name;
-    struct crash_item *value;
-    g_hash_table_iter_init(&iter, crash_data);
+    struct problem_item *value;
+    g_hash_table_iter_init(&iter, problem_data);
     while (g_hash_table_iter_next(&iter, (void**)&name, (void**)&value))
     {
         log("%s[%s]:'%s' 0x%x",
diff --git a/src/lib/run_event.c b/src/lib/run_event.c
index 08711ea0..e577c383 100644
--- a/src/lib/run_event.c
+++ b/src/lib/run_event.c
@@ -339,11 +339,11 @@ int run_event_on_dir_name(struct run_event_state *state,
     return retval;
 }
 
-int run_event_on_crash_data(struct run_event_state *state, crash_data_t *data, const char *event)
+int run_event_on_problem_data(struct run_event_state *state, problem_data_t *data, const char *event)
 {
     state->children_count = 0;
 
-    struct dump_dir *dd = create_dump_dir_from_crash_data(data, NULL);
+    struct dump_dir *dd = create_dump_dir_from_problem_data(data, NULL);
     if (!dd)
         return -1;
     char *dir_name = xstrdup(dd->dd_dirname);
@@ -356,7 +356,7 @@ int run_event_on_crash_data(struct run_event_state *state, crash_data_t *data, c
     free(dir_name);
     if (dd)
     {
-        load_crash_data_from_dump_dir(data, dd);
+        load_problem_data_from_dump_dir(data, dd);
         dd_delete(dd);
     }
     return r;