diff options
25 files changed, 42 insertions, 43 deletions
diff --git a/src/cli/dbus.h b/src/cli/dbus.h index 8b56b152..9c99c662 100644 --- a/src/cli/dbus.h +++ b/src/cli/dbus.h @@ -19,7 +19,7 @@ #define ABRT_CLI_DBUS_H #include "abrt_dbus.h" -#include "crash_types.h" +#include "abrt_crash_dump.h" extern DBusConnection* s_dbus_conn; diff --git a/src/daemon/CommLayerServer.h b/src/daemon/CommLayerServer.h index 6eb8b464..5b7ecf57 100644 --- a/src/daemon/CommLayerServer.h +++ b/src/daemon/CommLayerServer.h @@ -20,7 +20,7 @@ #define COMMLAYERSERVER_H_ #include "abrtlib.h" -#include "crash_types.h" +#include "abrt_crash_dump.h" class CCommLayerServer { public: diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp index f0f9dee8..609b0b26 100644 --- a/src/daemon/Daemon.cpp +++ b/src/daemon/Daemon.cpp @@ -536,7 +536,7 @@ static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpoin char *d = concat_path_file(DEBUG_DUMPS_DIR, worst_dir); free(worst_dir); worst_dir = NULL; - delete_debug_dump_dir(d); + delete_crash_dump_dir(d); free(d); } } @@ -561,7 +561,7 @@ static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpoin log("Deleting crash %s (dup of %s), sending dbus signal", strrchr(fullname, '/') + 1, strrchr(first, '/') + 1); - delete_debug_dump_dir(fullname); + delete_crash_dump_dir(fullname); } const char *uid_str = get_crash_data_item_content_or_NULL(crashinfo, FILENAME_UID); @@ -586,7 +586,7 @@ static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpoin case MW_GPG_ERROR: default: log("Corrupted or bad crash %s (res:%d), deleting", fullname, (int)res); - delete_debug_dump_dir(fullname); + delete_crash_dump_dir(fullname); break; } } diff --git a/src/daemon/Daemon.h b/src/daemon/Daemon.h index 62088651..158b48fb 100644 --- a/src/daemon/Daemon.h +++ b/src/daemon/Daemon.h @@ -21,7 +21,7 @@ #include <pthread.h> #include "abrt_types.h" -#include "crash_types.h" +#include "abrt_crash_dump.h" class CCrashWatcher; class CCommLayerServer; diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp index 27fd8fcf..ee2853b2 100644 --- a/src/daemon/MiddleWare.cpp +++ b/src/daemon/MiddleWare.cpp @@ -72,7 +72,7 @@ static bool DebugDumpToCrashReport(const char *dump_dir_name, map_crash_data_t& v++; } - load_crash_data_from_debug_dump(dd, pCrashData); + load_crash_data_from_crash_dump_dir(dd, pCrashData); char *events = list_possible_events(dd, NULL, ""); dd_close(dd); @@ -143,7 +143,7 @@ mw_result_t CreateCrashReport(const char *dump_dir_name, goto ret; } - /* Do a load_crash_data_from_debug_dump from (possibly updated) + /* Do a load_crash_data_from_crash_dump_dir from (possibly updated) * crash dump dir */ if (!DebugDumpToCrashReport(dump_dir_name, pCrashData)) @@ -575,7 +575,7 @@ static mw_result_t FillCrashInfo(const char *dump_dir_name, if (!dd) return MW_ERROR; - load_crash_data_from_debug_dump(dd, pCrashData); + load_crash_data_from_crash_dump_dir(dd, pCrashData); char *events = list_possible_events(dd, NULL, ""); dd_close(dd); @@ -648,7 +648,7 @@ vector_map_crash_data_t GetCrashInfos(long caller_uid) break; case MW_ERROR: error_msg("Dump directory %s doesn't exist or misses crucial files, deleting", dump_dir_name); - delete_debug_dump_dir(dump_dir_name); + delete_crash_dump_dir(dump_dir_name); break; default: break; diff --git a/src/daemon/abrt-server.c b/src/daemon/abrt-server.c index db07fe94..fdf66e59 100644 --- a/src/daemon/abrt-server.c +++ b/src/daemon/abrt-server.c @@ -17,7 +17,7 @@ */ #include "abrtlib.h" #include "dump_dir.h" -#include "crash_types.h" /* FILENAME_foo */ +#include "abrt_crash_dump.h" /* FILENAME_foo */ #include "hooklib.h" #include "parse_options.h" diff --git a/src/gui/CCDump.py b/src/gui/CCDump.py index 380cb996..df5c18aa 100644 --- a/src/gui/CCDump.py +++ b/src/gui/CCDump.py @@ -3,7 +3,7 @@ from datetime import datetime from abrt_utils import _, init_logging, log, log1, log2 -# Keep in sync with crash_types.h! +# Keep in sync with [abrt_]crash_dump.h! CD_TYPE = 0 CD_EDITABLE = 1 CD_CONTENT = 2 diff --git a/src/hooks/abrt-hook-ccpp.c b/src/hooks/abrt-hook-ccpp.c index dbf0c059..bcdc8547 100644 --- a/src/hooks/abrt-hook-ccpp.c +++ b/src/hooks/abrt-hook-ccpp.c @@ -498,8 +498,8 @@ int main(int argc, char** argv) } /* We close dumpdir before we start catering for crash storm case. - * Otherwise, delete_debug_dump_dir's from other concurrent - * CCpp's won't be able to delete our dump (their delete_debug_dump_dir + * Otherwise, delete_crash_dump_dir's from other concurrent + * CCpp's won't be able to delete our dump (their delete_crash_dump_dir * will wait for us), and we won't be able to delete their dumps. * Classic deadlock. */ diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 11f3e461..3716d19e 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -3,7 +3,7 @@ HEADER_FILES = \ abrtlib.h \ abrt_types.h \ comm_layer_inner.h \ - crash_types.h \ + abrt_crash_dump.h \ dbus_common.h \ dump_dir.h \ observer.h \ diff --git a/src/include/crash_types.h b/src/include/abrt_crash_dump.h index 28b2eb09..ed7ffe95 100644 --- a/src/include/crash_types.h +++ b/src/include/abrt_crash_dump.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 CRASHTYPES_H_ -#define CRASHTYPES_H_ +#ifndef ABRT_CRASH_DUMP_H_ +#define ABRT_CRASH_DUMP_H_ #include "abrt_types.h" @@ -114,7 +114,7 @@ void add_to_crash_data(map_crash_data_t& pCrashData, const char *pItem, const char *pContent); -void load_crash_data_from_debug_dump(struct dump_dir *dd, map_crash_data_t& data); +void load_crash_data_from_crash_dump_dir(struct dump_dir *dd, map_crash_data_t& data); const char *get_crash_data_item_content_or_NULL(const map_crash_data_t& crash_data, const char *key); // Aborts if key is not found: diff --git a/src/include/abrtlib.h b/src/include/abrtlib.h index cbaafc60..8cd0664a 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 "hash_sha1.h" #include "hash_md5.h" -#include "crash_types.h" +#include "abrt_crash_dump.h" #include "dump_dir.h" #include "abrt_types.h" diff --git a/src/include/dbus_common.h b/src/include/dbus_common.h index 63053cc9..6c739169 100644 --- a/src/include/dbus_common.h +++ b/src/include/dbus_common.h @@ -19,7 +19,7 @@ #ifndef DBUSCOMMON_H_ #define DBUSCOMMON_H_ -#include "crash_types.h" +#include "abrt_crash_dump.h" #define ABRTD_DBUS_NAME "com.redhat.abrt" #define ABRTD_DBUS_PATH "/com/redhat/abrt" diff --git a/src/include/dump_dir.h b/src/include/dump_dir.h index fc882185..7a38f1e4 100644 --- a/src/include/dump_dir.h +++ b/src/include/dump_dir.h @@ -1,6 +1,5 @@ /* - DebugDump.h - header file for the library caring of writing new reports - to the specific directory + On-disk storage of crash dumps Copyright (C) 2009 Zdenek Prikryl (zprikryl@redhat.com) Copyright (C) 2009 RedHat inc. @@ -19,8 +18,8 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef DEBUGDUMP_H_ -#define DEBUGDUMP_H_ +#ifndef DUMP_DIR_H_ +#define DUMP_DIR_H_ #ifdef __cplusplus extern "C" { @@ -56,7 +55,7 @@ void dd_save_text(struct dump_dir *dd, const char *name, const char *data); void dd_save_binary(struct dump_dir *dd, const char *name, const char *data, unsigned size); void dd_delete(struct dump_dir *dd); -void delete_debug_dump_dir(const char *dd_dir); +void delete_crash_dump_dir(const char *dd_dir); #ifdef __cplusplus } diff --git a/src/include/plugin.h b/src/include/plugin.h index 0ab85617..3f652e65 100644 --- a/src/include/plugin.h +++ b/src/include/plugin.h @@ -23,7 +23,7 @@ #define PLUGIN_H_ #include "abrt_types.h" -#include "crash_types.h" +#include "abrt_crash_dump.h" #define PLUGINS_MAGIC_NUMBER 6 diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index baa13a24..ad2d2025 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -39,7 +39,7 @@ libabrt_la_SOURCES = \ load_plugin_settings.cpp \ make_descr.cpp \ run_event.c \ - CrashTypes.cpp \ + crash_dump.cpp \ ABRTException.cpp \ hooklib.c hooklib.h \ parse_release.cpp \ diff --git a/src/lib/CrashTypes.cpp b/src/lib/crash_dump.cpp index acacda5e..338724d5 100644 --- a/src/lib/CrashTypes.cpp +++ b/src/lib/crash_dump.cpp @@ -17,7 +17,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "abrtlib.h" -#include "crash_types.h" +#include "abrt_crash_dump.h" const char *const must_have_files[] = { FILENAME_ARCHITECTURE, @@ -156,7 +156,7 @@ static char* is_text_file(const char *name, ssize_t *sz) return NULL; /* it's binary */ } -void load_crash_data_from_debug_dump(struct dump_dir *dd, map_crash_data_t& data) +void load_crash_data_from_crash_dump_dir(struct dump_dir *dd, map_crash_data_t& data) { char *short_name; char *full_name; diff --git a/src/lib/dump_dir.c b/src/lib/dump_dir.c index 486c7cfe..19f86072 100644 --- a/src/lib/dump_dir.c +++ b/src/lib/dump_dir.c @@ -504,7 +504,7 @@ int dd_get_next_file(struct dump_dir *dd, char **short_name, char **full_name) } /* Utility function */ -void delete_debug_dump_dir(const char *dd_dir) +void delete_crash_dump_dir(const char *dd_dir) { struct dump_dir *dd = dd_opendir(dd_dir, /*flags:*/ 0); if (dd) diff --git a/src/lib/hooklib.c b/src/lib/hooklib.c index 062e3ddb..63c8a634 100644 --- a/src/lib/hooklib.c +++ b/src/lib/hooklib.c @@ -132,7 +132,7 @@ void trim_debug_dumps(unsigned setting_MaxCrashReportsSize, const char *exclude_ char *d = concat_path_file(DEBUG_DUMPS_DIR, worst_dir); free(worst_dir); worst_dir = NULL; - delete_debug_dump_dir(d); + delete_crash_dump_dir(d); free(d); } } diff --git a/src/lib/make_descr.cpp b/src/lib/make_descr.cpp index a0cb5691..e11325c8 100644 --- a/src/lib/make_descr.cpp +++ b/src/lib/make_descr.cpp @@ -17,7 +17,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "abrtlib.h" -#include "crash_types.h" +#include "abrt_crash_dump.h" using namespace std; diff --git a/src/plugins/abrt-action-bugzilla.cpp b/src/plugins/abrt-action-bugzilla.cpp index 7b51e9aa..b396e453 100644 --- a/src/plugins/abrt-action-bugzilla.cpp +++ b/src/plugins/abrt-action-bugzilla.cpp @@ -18,7 +18,7 @@ */ #include "abrtlib.h" #include "abrt_xmlrpc.h" -#include "crash_types.h" +#include "abrt_crash_dump.h" #include "abrt_exception.h" #define XML_RPC_SUFFIX "/xmlrpc.cgi" @@ -645,7 +645,7 @@ static void report_to_bugzilla( throw CABRTException(EXCEP_PLUGIN, _("Can't open '%s'"), dump_dir_name); } map_crash_data_t pCrashData; - load_crash_data_from_debug_dump(dd, pCrashData); + load_crash_data_from_crash_dump_dir(dd, pCrashData); dd_close(dd); const char *env; diff --git a/src/plugins/abrt-action-kerneloops.cpp b/src/plugins/abrt-action-kerneloops.cpp index 4ca375d1..1f9a561c 100644 --- a/src/plugins/abrt-action-kerneloops.cpp +++ b/src/plugins/abrt-action-kerneloops.cpp @@ -19,7 +19,7 @@ #include <curl/curl.h> #include "abrtlib.h" -#include "crash_types.h" +#include "abrt_crash_dump.h" #include "abrt_exception.h" #define PROGNAME "abrt-action-kerneloops" @@ -92,7 +92,7 @@ static void report_to_kerneloops( exit(1); /* error msg is already logged */ map_crash_data_t pCrashData; - load_crash_data_from_debug_dump(dd, pCrashData); + load_crash_data_from_crash_dump_dir(dd, pCrashData); dd_close(dd); const char *backtrace = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_BACKTRACE); diff --git a/src/plugins/abrt-action-mailx.cpp b/src/plugins/abrt-action-mailx.cpp index a7f9a488..fa7fd8a0 100644 --- a/src/plugins/abrt-action-mailx.cpp +++ b/src/plugins/abrt-action-mailx.cpp @@ -21,7 +21,7 @@ #include "abrtlib.h" #include "parse_options.h" -#include "crash_types.h" +#include "abrt_crash_dump.h" #include "abrt_exception.h" #define PROGNAME "abrt-action-mailx" @@ -67,7 +67,7 @@ static void create_and_send_email( exit(1); /* error msg is already logged by dd_opendir */ map_crash_data_t pCrashData; - load_crash_data_from_debug_dump(dd, pCrashData); + load_crash_data_from_crash_dump_dir(dd, pCrashData); dd_close(dd); char* env; diff --git a/src/plugins/abrt-action-print.cpp b/src/plugins/abrt-action-print.cpp index 26bea102..303c05f7 100644 --- a/src/plugins/abrt-action-print.cpp +++ b/src/plugins/abrt-action-print.cpp @@ -20,7 +20,7 @@ */ #include "abrtlib.h" #include "parse_options.h" -#include "crash_types.h" +#include "abrt_crash_dump.h" #include "abrt_exception.h" #define PROGNAME "abrt-action-print" @@ -82,7 +82,7 @@ int main(int argc, char **argv) return 1; /* error message is already logged */ map_crash_data_t pCrashData; - load_crash_data_from_debug_dump(dd, pCrashData); + load_crash_data_from_crash_dump_dir(dd, pCrashData); dd_close(dd); char *dsc = make_description_logger(pCrashData); diff --git a/src/plugins/abrt-action-rhtsupport.cpp b/src/plugins/abrt-action-rhtsupport.cpp index f1b8cfb9..eb69489d 100644 --- a/src/plugins/abrt-action-rhtsupport.cpp +++ b/src/plugins/abrt-action-rhtsupport.cpp @@ -22,7 +22,7 @@ #include "abrt_curl.h" #include "abrt_xmlrpc.h" #include "abrt_rh_support.h" -#include "crash_types.h" +#include "abrt_crash_dump.h" #include "abrt_exception.h" #define PROGNAME "abrt-action-rhtsupport" @@ -36,7 +36,7 @@ static void report_to_rhtsupport( exit(1); /* error msg is already logged by dd_opendir */ map_crash_data_t pCrashData; - load_crash_data_from_debug_dump(dd, pCrashData); + load_crash_data_from_crash_dump_dir(dd, pCrashData); dd_close(dd); /* Gzipping e.g. 0.5gig coredump takes a while. Let client know what we are doing */ diff --git a/src/plugins/abrt-action-upload.cpp b/src/plugins/abrt-action-upload.cpp index 726b9183..9741f543 100644 --- a/src/plugins/abrt-action-upload.cpp +++ b/src/plugins/abrt-action-upload.cpp @@ -21,7 +21,7 @@ #include <curl/curl.h> #include "abrtlib.h" #include "parse_options.h" -#include "crash_types.h" +#include "abrt_crash_dump.h" #include "abrt_exception.h" #define PROGNAME "abrt-action-upload" |