diff options
author | Denys Vlasenko <dvlasenk@redhat.com> | 2011-04-23 17:21:17 +0200 |
---|---|---|
committer | Denys Vlasenko <dvlasenk@redhat.com> | 2011-04-23 17:21:17 +0200 |
commit | 042d62126a0ca8b6b9d2fb4d417f07691be90536 (patch) | |
tree | 9e43a823767d875bb35f3deb6f60df49bbd26f33 /src/include | |
parent | d3da30c4726a193101ee9c17a71c23cf32fa63ca (diff) | |
download | abrt-042d62126a0ca8b6b9d2fb4d417f07691be90536.tar.gz abrt-042d62126a0ca8b6b9d2fb4d417f07691be90536.tar.xz abrt-042d62126a0ca8b6b9d2fb4d417f07691be90536.zip |
mass replace of crash_data with problem_data
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/Makefile.am | 4 | ||||
-rw-r--r-- | src/include/abrt_problem_data.h (renamed from src/include/abrt_crash_data.h) | 14 | ||||
-rw-r--r-- | src/include/abrtlib.h | 10 | ||||
-rw-r--r-- | src/include/report/dump_dir.h | 2 | ||||
-rw-r--r-- | src/include/report/problem_data.h (renamed from src/include/report/crash_data.h) | 50 | ||||
-rw-r--r-- | src/include/report/run_event.h | 4 |
6 files changed, 42 insertions, 42 deletions
diff --git a/src/include/Makefile.am b/src/include/Makefile.am index e6f0387b..eaebe3a1 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -1,6 +1,6 @@ libreport_includedir = $(includedir)/report libreport_include_HEADERS = \ - report/crash_data.h \ + report/problem_data.h \ report/dump_dir.h \ report/run_event.h \ report/event_config.h @@ -9,5 +9,5 @@ libabrt_includedir = $(includedir)/abrt libabrt_include_HEADERS = \ abrtlib.h \ abrt_types.h \ - abrt_crash_data.h \ + abrt_problem_data.h \ xfuncs.h diff --git a/src/include/abrt_crash_data.h b/src/include/abrt_problem_data.h index 237a3d01..3ab6679c 100644 --- a/src/include/abrt_crash_data.h +++ b/src/include/abrt_problem_data.h @@ -16,10 +16,10 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef ABRT_CRASH_DUMP_H_ -#define ABRT_CRASH_DUMP_H_ +#ifndef ABRT_PROBLEM_DATA_H_ +#define ABRT_PROBLEM_DATA_H_ -#include "crash_data.h" +#include "problem_data.h" #include "abrt_types.h" // Text bigger than this usually is attached, not added inline @@ -54,7 +54,7 @@ #define FILENAME_COMMENT "comment" #define FILENAME_RATING "rating" #define FILENAME_HOSTNAME "hostname" -// Optional. Set to "1" by abrt-handle-upload for every unpacked crashdump +// Optional. Set to "1" by abrt-handle-upload for every unpacked dump #define FILENAME_REMOTE "remote" #define FILENAME_TAINTED "kernel_tainted" // TODO: TicketUploader also has open-coded "TICKET", "CUSTOMER" files @@ -71,7 +71,7 @@ #define FILENAME_EVENT_LOG "event_log" // Not stored as files, added "on the fly": #define CD_DUMPDIR "DumpDir" -// "Which events are possible (make sense) on this crash dump?" +// "Which events are possible (make sense) on this dump dir?" // (a string with "\n" terminated event names) #define CD_EVENTS "Events" @@ -90,8 +90,8 @@ extern "C" { #define add_reported_to abrt_add_reported_to void add_reported_to(struct dump_dir *dd, const char *line); -#define log_crash_data abrt_log_crash_data -void log_crash_data(crash_data_t *crash_data, const char *pfx); +#define log_problem_data abrt_log_problem_data +void log_problem_data(problem_data_t *problem_data, const char *pfx); #ifdef __cplusplus } diff --git a/src/include/abrtlib.h b/src/include/abrtlib.h index 6d9337d5..19ce7ad9 100644 --- a/src/include/abrtlib.h +++ b/src/include/abrtlib.h @@ -77,7 +77,7 @@ int vdprintf(int d, const char *format, va_list ap); #include "strbuf.h" #include "hash_sha1.h" -#include "abrt_crash_data.h" +#include "abrt_problem_data.h" #include "abrt_types.h" #include "dump_dir.h" #include "hooklib.h" @@ -239,13 +239,13 @@ int daemon_is_ok(); char *iso_date_string(time_t *pt); #define make_description_bz abrt_make_description_bz -char* make_description_bz(crash_data_t *crash_data); +char* make_description_bz(problem_data_t *problem_data); #define make_description_comment abrt_make_description_comment -char* make_description_comment(crash_data_t *crash_data); +char* make_description_comment(problem_data_t *problem_data); #define make_description_logger abrt_make_description_logger -char* make_description_logger(crash_data_t *crash_data); +char* make_description_logger(problem_data_t *problem_data); #define make_description_mailx abrt_make_description_mailx -char* make_description_mailx(crash_data_t *crash_data); +char* make_description_mailx(problem_data_t *problem_data); #define parse_release_for_bz abrt_parse_release_for_bz void parse_release_for_bz(const char *pRelease, char **product, char **version); diff --git a/src/include/report/dump_dir.h b/src/include/report/dump_dir.h index 026571b7..c88ebe7f 100644 --- a/src/include/report/dump_dir.h +++ b/src/include/report/dump_dir.h @@ -1,5 +1,5 @@ /* - On-disk storage of crash dumps + On-disk storage of problem data Copyright (C) 2009 Zdenek Prikryl (zprikryl@redhat.com) Copyright (C) 2009 RedHat inc. diff --git a/src/include/report/crash_data.h b/src/include/report/problem_data.h index e152c63f..1481654f 100644 --- a/src/include/report/crash_data.h +++ b/src/include/report/problem_data.h @@ -16,8 +16,8 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef CRASH_DATA_H_ -#define CRASH_DATA_H_ +#ifndef PROBLEM_DATA_H_ +#define PROBLEM_DATA_H_ #include <glib.h> @@ -37,55 +37,55 @@ enum { CD_FLAG_UNIXTIME = (1 << 5), }; -struct crash_item { +struct problem_item { char *content; unsigned flags; }; -typedef struct crash_item crash_item; +typedef struct problem_item problem_item; -char *format_crash_item(struct crash_item *item); +char *format_problem_item(struct problem_item *item); -/* In-memory crash data structure and accessors */ +/* In-memory problem data structure and accessors */ -typedef GHashTable crash_data_t; +typedef GHashTable problem_data_t; -crash_data_t *new_crash_data(void); +problem_data_t *new_problem_data(void); -static inline void free_crash_data(crash_data_t *crash_data) +static inline void free_problem_data(problem_data_t *problem_data) { - if (crash_data) - g_hash_table_destroy(crash_data); + if (problem_data) + g_hash_table_destroy(problem_data); } -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); /* Uses CD_FLAG_TXT + CD_FLAG_ISNOTEDITABLE flags */ -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); -static inline struct crash_item *get_crash_data_item_or_NULL(crash_data_t *crash_data, const char *key) +static inline struct problem_item *get_problem_data_item_or_NULL(problem_data_t *problem_data, const char *key) { - return (struct crash_item *)g_hash_table_lookup(crash_data, key); + return (struct problem_item *)g_hash_table_lookup(problem_data, key); } -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); /* Aborts if key is not found: */ -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); /* Vector of these structures */ -typedef GPtrArray vector_of_crash_data_t; +typedef GPtrArray vector_of_problem_data_t; -static inline crash_data_t *get_crash_data(vector_of_crash_data_t *vector, unsigned i) +static inline problem_data_t *get_problem_data(vector_of_problem_data_t *vector, unsigned i) { - return (crash_data_t *)g_ptr_array_index(vector, i); + return (problem_data_t *)g_ptr_array_index(vector, i); } -vector_of_crash_data_t *new_vector_of_crash_data(void); -static inline void free_vector_of_crash_data(vector_of_crash_data_t *vector) +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); @@ -94,10 +94,10 @@ static inline void free_vector_of_crash_data(vector_of_crash_data_t *vector) /* Conversions between in-memory and on-disk formats */ -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); +void load_problem_data_from_dump_dir(problem_data_t *problem_data, struct dump_dir *dd); +problem_data_t *create_problem_data_from_dump_dir(struct dump_dir *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); #ifdef __cplusplus } diff --git a/src/include/report/run_event.h b/src/include/report/run_event.h index 7fd8edea..8bd86543 100644 --- a/src/include/report/run_event.h +++ b/src/include/report/run_event.h @@ -19,7 +19,7 @@ #ifndef RUN_EVENT_H_ #define RUN_EVENT_H_ -#include "crash_data.h" +#include "problem_data.h" #ifdef __cplusplus extern "C" { @@ -65,7 +65,7 @@ void free_commands(struct run_event_state *state); * of post_run_callback. If all actions are successful, returns 0. */ int run_event_on_dir_name(struct run_event_state *state, const char *dump_dir_name, const char *event); -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); /* Querying for possible events */ |