preparatory patch for future factoring out of headers for reportlib

Some files and functions are renamed, no logic changes.

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

6 files changed, 11 insertions, 12 deletions

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