Rename foo_crash_dump_dir -> foo_dump_dir

To be exact, these three functions are renamed:

load_crash_data_from_crash_dump_dir
create_crash_dump_dir
delete_crash_dump_dir

Rationale: data structure is called "struct dump_dir", not
"struct crash_dump_dir"

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

20 files changed, 40 insertions, 57 deletions

diff --git a/src/applet/test_report.c b/src/applet/test_report.c
index 92a5d0af..6361aadc 100644
--- a/src/applet/test_report.c
+++ b/src/applet/test_report.c
@@ -39,7 +39,7 @@ int main(int argc, char** argv)
     add_to_crash_data(crash_data, "analyzer", "wow");
     const char *event = "report";
 
-    struct dump_dir *dd = create_crash_dump_dir(crash_data);
+    struct dump_dir *dd = create_dump_dir(crash_data);
     free_crash_data(crash_data);
     if (!dd)
         return 1;
@@ -55,7 +55,7 @@ int main(int argc, char** argv)
         printf("No actions are found for event '%s'\n", event);
     free_run_event_state(run_state);
 
-//    delete_crash_dump_dir(dir_name);
+//    delete_dump_dir(dir_name);
     free(dir_name);
 
     return 0;
diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp
index f98d8741..a181da15 100644
--- a/src/daemon/Daemon.cpp
+++ b/src/daemon/Daemon.cpp
@@ -535,7 +535,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_crash_dump_dir(d);
+                delete_dump_dir(d);
                 free(d);
             }
         }
@@ -558,7 +558,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_crash_dump_dir(fullname);
+                    delete_dump_dir(fullname);
                 }
 
                 const char *uid_str = get_crash_item_content_or_NULL(crash_data, FILENAME_UID);
@@ -583,7 +583,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_crash_dump_dir(fullname);
+                delete_dump_dir(fullname);
                 break;
         }
         free(fullname);
diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp
index 51f7929d..724b092a 100644
--- a/src/daemon/MiddleWare.cpp
+++ b/src/daemon/MiddleWare.cpp
@@ -79,7 +79,7 @@ static crash_data_t *DebugDumpToCrashReport(const char *dump_dir_name)
         v++;
     }
 
-    crash_data_t *crash_data = load_crash_data_from_crash_dump_dir(dd);
+    crash_data_t *crash_data = load_crash_data_from_dump_dir(dd);
     char *events = list_possible_events(dd, NULL, "");
     dd_close(dd);
 
@@ -162,7 +162,7 @@ static mw_result_t CreateCrashReport(const char *dump_dir_name,
         goto ret;
     }
 
-    /* Do a load_crash_data_from_crash_dump_dir from (possibly updated)
+    /* Do a load_crash_data_from_dump_dir from (possibly updated)
      * crash dump dir
      */
     *crash_data = DebugDumpToCrashReport(dump_dir_name);
@@ -590,7 +590,7 @@ static crash_data_t *FillCrashInfo(const char *dump_dir_name)
     if (!dd)
         return NULL;
 
-    crash_data_t *crash_data = load_crash_data_from_crash_dump_dir(dd);
+    crash_data_t *crash_data = load_crash_data_from_dump_dir(dd);
     char *events = list_possible_events(dd, NULL, "");
     dd_close(dd);
 
@@ -656,7 +656,7 @@ vector_of_crash_data_t *GetCrashInfos(long caller_uid)
                 if (!crash_data)
                 {
                     error_msg("Dump directory %s doesn't exist or misses crucial files, deleting", dump_dir_name);
-                    delete_crash_dump_dir(dump_dir_name);
+                    delete_dump_dir(dump_dir_name);
                 }
                 else
                 {
diff --git a/src/hooks/abrt-hook-ccpp.c b/src/hooks/abrt-hook-ccpp.c
index fba36a5e..430eaf6c 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_crash_dump_dir's from other concurrent
-         * CCpp's won't be able to delete our dump (their delete_crash_dump_dir
+         * Otherwise, delete_dump_dir's from other concurrent
+         * CCpp's won't be able to delete our dump (their delete_dump_dir
          * will wait for us), and we won't be able to delete their dumps.
          * Classic deadlock.
          */
diff --git a/src/include/report/crash_dump.h b/src/include/report/crash_dump.h
index 10ddc885..aabfa022 100644
--- a/src/include/report/crash_dump.h
+++ b/src/include/report/crash_dump.h
@@ -90,8 +90,8 @@ static inline void free_vector_of_crash_data(vector_of_crash_data_t *vector)
 
 /* Conversions between in-memory and on-disk formats */
 
-crash_data_t *load_crash_data_from_crash_dump_dir(struct dump_dir *dd);
-struct dump_dir *create_crash_dump_dir(crash_data_t *crash_data);
+crash_data_t *load_crash_data_from_dump_dir(struct dump_dir *dd);
+struct dump_dir *create_dump_dir(crash_data_t *crash_data);
 
 #ifdef __cplusplus
 }
diff --git a/src/include/report/dump_dir.h b/src/include/report/dump_dir.h
index 8cec9459..bf3b120d 100644
--- a/src/include/report/dump_dir.h
+++ b/src/include/report/dump_dir.h
@@ -59,7 +59,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_crash_dump_dir(const char *dd_dir);
+void delete_dump_dir(const char *dd_dir);
 
 #ifdef __cplusplus
 }
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 744522a9..13029360 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -36,7 +36,7 @@ libreport_la_SOURCES = \
     make_descr.c \
     run_event.c \
     crash_dump.c \
-    create_crash_dump_dir.c \
+    create_dump_dir.c \
     abrt_types.c \
     hooklib.c hooklib.h \
     parse_release.c \
diff --git a/src/lib/crash_dump.c b/src/lib/crash_dump.c
index 73181c72..189ec9cf 100644
--- a/src/lib/crash_dump.c
+++ b/src/lib/crash_dump.c
@@ -180,7 +180,7 @@ static char* is_text_file(const char *name, ssize_t *sz)
     return NULL; /* it's binary */
 }
 
-crash_data_t *load_crash_data_from_crash_dump_dir(struct dump_dir *dd)
+crash_data_t *load_crash_data_from_dump_dir(struct dump_dir *dd)
 {
     char *short_name;
     char *full_name;
diff --git a/src/lib/create_crash_dump_dir.c b/src/lib/create_dump_dir.c
index e05d1d9d..8735de27 100644
--- a/src/lib/create_crash_dump_dir.c
+++ b/src/lib/create_dump_dir.c
@@ -19,7 +19,7 @@
 
 #include "abrtlib.h"
 
-struct dump_dir *create_crash_dump_dir(crash_data_t *crash_data)
+struct dump_dir *create_dump_dir(crash_data_t *crash_data)
 {
     char *path = xasprintf(LOCALSTATEDIR"/run/abrt/tmp-%lu-%lu", (long)getpid(), (long)time(NULL));
     struct dump_dir *dd = dd_create(path, getuid());
diff --git a/src/lib/dump_dir.c b/src/lib/dump_dir.c
index 19f86072..8e1744a2 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_crash_dump_dir(const char *dd_dir)
+void delete_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 63c8a634..a89ab008 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_crash_dump_dir(d);
+        delete_dump_dir(d);
         free(d);
     }
 }
diff --git a/src/plugins/abrt-action-bugzilla.cpp b/src/plugins/abrt-action-bugzilla.cpp
index db492051..19acc4fe 100644
--- a/src/plugins/abrt-action-bugzilla.cpp
+++ b/src/plugins/abrt-action-bugzilla.cpp
@@ -639,7 +639,7 @@ static void report_to_bugzilla(
     struct dump_dir *dd = dd_opendir(dump_dir_name, /*flags:*/ 0);
     if (!dd)
         xfunc_die(); /* dd_opendir already emitted error msg */
-    crash_data_t *crash_data = load_crash_data_from_crash_dump_dir(dd);
+    crash_data_t *crash_data = load_crash_data_from_dump_dir(dd);
     dd_close(dd);
 
     const char *env;
diff --git a/src/plugins/abrt-action-kerneloops.c b/src/plugins/abrt-action-kerneloops.c
index f3351ccd..ee4dce2f 100644
--- a/src/plugins/abrt-action-kerneloops.c
+++ b/src/plugins/abrt-action-kerneloops.c
@@ -90,7 +90,7 @@ static void report_to_kerneloops(
     if (!dd)
         exit(1); /* error msg is already logged */
 
-    crash_data_t *crash_data = load_crash_data_from_crash_dump_dir(dd);
+    crash_data_t *crash_data = load_crash_data_from_dump_dir(dd);
     dd_close(dd);
 
     const char *backtrace = get_crash_item_content_or_NULL(crash_data, FILENAME_BACKTRACE);
diff --git a/src/plugins/abrt-action-mailx.c b/src/plugins/abrt-action-mailx.c
index ea26b9cb..4812e64f 100644
--- a/src/plugins/abrt-action-mailx.c
+++ b/src/plugins/abrt-action-mailx.c
@@ -67,7 +67,7 @@ static void create_and_send_email(
     if (!dd)
         exit(1); /* error msg is already logged by dd_opendir */
 
-    crash_data_t *crash_data = load_crash_data_from_crash_dump_dir(dd);
+    crash_data_t *crash_data = load_crash_data_from_dump_dir(dd);
     dd_close(dd);
 
     char* env;
diff --git a/src/plugins/abrt-action-print.c b/src/plugins/abrt-action-print.c
index 55631c96..4c28d3f3 100644
--- a/src/plugins/abrt-action-print.c
+++ b/src/plugins/abrt-action-print.c
@@ -78,7 +78,7 @@ int main(int argc, char **argv)
     if (!dd)
         return 1; /* error message is already logged */
 
-    crash_data_t *crash_data = load_crash_data_from_crash_dump_dir(dd);
+    crash_data_t *crash_data = load_crash_data_from_dump_dir(dd);
     dd_close(dd);
 
     char *dsc = make_description_logger(crash_data);
diff --git a/src/plugins/abrt-action-rhtsupport.c b/src/plugins/abrt-action-rhtsupport.c
index 024b1efc..7e950b0a 100644
--- a/src/plugins/abrt-action-rhtsupport.c
+++ b/src/plugins/abrt-action-rhtsupport.c
@@ -34,7 +34,7 @@ static void report_to_rhtsupport(
     if (!dd)
         exit(1); /* error msg is already logged by dd_opendir */
 
-    crash_data_t *crash_data = load_crash_data_from_crash_dump_dir(dd);
+    crash_data_t *crash_data = load_crash_data_from_dump_dir(dd);
     dd_close(dd);
 
     /* Gzipping e.g. 0.5gig coredump takes a while. Let client know what we are doing */
diff --git a/src/report-python/crash_dump.c b/src/report-python/crash_dump.c
index 868e97ec..63f390b2 100644
--- a/src/report-python/crash_dump.c
+++ b/src/report-python/crash_dump.c
@@ -59,37 +59,21 @@ void add_to_crash_data_ext(crash_data_t *crash_data,
                 const char *content,
                 unsigned flags);
 */
-static PyObject *p_crash_data_add_ext(PyObject *pself, PyObject *args)
+static PyObject *p_crash_data_add(PyObject *pself, PyObject *args)
 {
     p_crash_data *self = (p_crash_data*)pself;
 
     const char *name;
     const char *content;
-    int FLAGS;
-    if (!PyArg_ParseTuple(args, "ssi", &name, &content, &FLAGS))
+    int flags = 0;
+    if (!PyArg_ParseTuple(args, "ss|i", &name, &content, &flags))
     {
         /* PyArg_ParseTuple raises the exception saying why it fails
          * eg: TypeError: function takes exactly 2 arguments (1 given)
          */
         return NULL;
     }
-    add_to_crash_data_ext(self->cd, name, content, FLAGS);
-
-    /* every function returns PyObject, to return void we need to do this */
-    Py_RETURN_NONE;
-}
-
-static PyObject *p_crash_data_add(PyObject *pself, PyObject *args)
-{
-    p_crash_data *self = (p_crash_data*)pself;
-
-    const char *name;
-    const char *content;
-    if (!PyArg_ParseTuple(args, "ss", &name, &content))
-    {
-        return NULL;
-    }
-    add_to_crash_data(self->cd, name, content);
+    add_to_crash_data_ext(self->cd, name, content, flags);
 
     /* every function returns PyObject, to return void we need to do this */
     Py_RETURN_NONE;
@@ -108,14 +92,14 @@ static PyObject *p_get_crash_data_item(PyObject *pself, PyObject *args)
     return Py_BuildValue("sI", ci->content, ci->flags);
 }
 
-/* struct dump_dir *create_crash_dump_dir(crash_data_t *crash_data); */
-static PyObject *p_create_crash_dump_dir(PyObject *pself, PyObject *args)
+/* struct dump_dir *create_dump_dir(crash_data_t *crash_data); */
+static PyObject *p_create_dump_dir(PyObject *pself, PyObject *args)
 {
     p_crash_data *self = (p_crash_data*)pself;
     p_dump_dir *new_dd = PyObject_New(p_dump_dir, &p_dump_dir_type);
     if (!new_dd)
         return NULL;
-    struct dump_dir *dd = create_crash_dump_dir(self->cd);
+    struct dump_dir *dd = create_dump_dir(self->cd);
     if (!dd)
     {
         PyObject_Del((PyObject*)new_dd);
@@ -131,10 +115,9 @@ static PyObject *p_create_crash_dump_dir(PyObject *pself, PyObject *args)
 //};
 
 static PyMethodDef p_crash_data_methods[] = {
-    { "add"        , p_crash_data_add, METH_VARARGS, "Adds item to the crash data using default flags" },
-    { "add_ext"    , p_crash_data_add_ext, METH_VARARGS, "Adds item to the crash data" },
-    { "get"        , p_get_crash_data_item, METH_VARARGS, "Gets the value of item indexed by the key" },
-    { "create_crash_dump_dir", p_create_crash_dump_dir, METH_NOARGS, "Saves the crash_data to"LOCALSTATEDIR"/run/abrt/tmp-<pid>-<time>" },
+    { "add"            , p_crash_data_add, METH_VARARGS, "Adds item to the crash data" },
+    { "get"            , p_get_crash_data_item, METH_VARARGS, "Gets the value of item indexed by the key" },
+    { "create_dump_dir", p_create_dump_dir, METH_NOARGS, "Saves the crash_data to"LOCALSTATEDIR"/run/abrt/tmp-<pid>-<time>" },
     { NULL }
 };
 
diff --git a/src/report-python/dump_dir.c b/src/report-python/dump_dir.c
index 8e1f17ef..df61ea74 100644
--- a/src/report-python/dump_dir.c
+++ b/src/report-python/dump_dir.c
@@ -199,5 +199,5 @@ PyObject *p_dd_create(PyObject *module, PyObject *args)
     return (PyObject*)new_dd;
 }
 
-/* void delete_crash_dump_dir(const char *dd_dir); */
-//static PyObject *p_delete_crash_dump_dir(PyObject *pself, PyObject *args);
+/* void delete_dump_dir(const char *dd_dir); */
+//static PyObject *p_delete_dump_dir(PyObject *pself, PyObject *args);
diff --git a/src/report-python/reportmodule.c b/src/report-python/reportmodule.c
index 5fa31ca2..4d38eeab 100644
--- a/src/report-python/reportmodule.c
+++ b/src/report-python/reportmodule.c
@@ -22,9 +22,9 @@
 PyObject *ReportError;
 
 static PyMethodDef module_methods[] = {
-    { "dd_opendir"           , p_dd_opendir, METH_VARARGS, NULL },
-    { "dd_create"            , p_dd_create, METH_VARARGS, NULL },
-//    { "delete_crash_dump_dir", p_delete_crash_dump_dir, METH_VARARGS, NULL },
+    { "dd_opendir"     , p_dd_opendir, METH_VARARGS, NULL },
+    { "dd_create"      , p_dd_create, METH_VARARGS, NULL },
+//    { "delete_dump_dir", p_delete_dump_dir, METH_VARARGS, NULL },
     { NULL }
 };
 
diff --git a/src/report-python/test_crash_data b/src/report-python/test_crash_data
index 50afc002..5f8f9a86 100755
--- a/src/report-python/test_crash_data
+++ b/src/report-python/test_crash_data
@@ -6,7 +6,7 @@ import report
 cd = crash_data()
 cd.add("foo", "bar")
 
-dd = cd.create_crash_dump_dir()
+dd = cd.create_dump_dir()
 
 if dd:
     print "dd is nonzero"