diff options
| author | Denys Vlasenko <dvlasenk@redhat.com> | 2011-01-20 16:39:20 +0100 |
|---|---|---|
| committer | Denys Vlasenko <dvlasenk@redhat.com> | 2011-01-20 16:39:20 +0100 |
| commit | 006e7e8dd2592c949c4f986473a8bfe975aa8264 (patch) | |
| tree | e82c5fcd2e397b80bd85dfd428d7d19e5c7d5c9a | |
| parent | 8edbe4daaa0948b3a718e376b9c4d2d847e4e2c1 (diff) | |
| download | abrt-006e7e8dd2592c949c4f986473a8bfe975aa8264.tar.gz abrt-006e7e8dd2592c949c4f986473a8bfe975aa8264.tar.xz abrt-006e7e8dd2592c949c4f986473a8bfe975aa8264.zip | |
convert abrt-action-save-package-data.cpp to C
The conversion is trivial: a few tweaks to one header file
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
| -rw-r--r-- | src/daemon/Makefile.am | 2 | ||||
| -rw-r--r-- | src/daemon/Settings.cpp | 1 | ||||
| -rw-r--r-- | src/daemon/Settings.h | 20 | ||||
| -rw-r--r-- | src/daemon/abrt-action-save-package-data.c (renamed from src/daemon/abrt-action-save-package-data.cpp) | 0 |
4 files changed, 15 insertions, 8 deletions
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index bef380bf..f3f7bc0f 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -80,7 +80,7 @@ abrt_handle_crashdump_LDADD = \ abrt_action_save_package_data_SOURCES = \ rpm.h rpm.c \ Settings.h Settings.cpp \ - abrt-action-save-package-data.cpp + abrt-action-save-package-data.c abrt_action_save_package_data_CPPFLAGS = \ -I$(srcdir)/../include/report -I$(srcdir)/../include \ -I$(srcdir)/../lib \ diff --git a/src/daemon/Settings.cpp b/src/daemon/Settings.cpp index d155b4ec..5b5b18dd 100644 --- a/src/daemon/Settings.cpp +++ b/src/daemon/Settings.cpp @@ -39,7 +39,6 @@ static map_string_t s_mapSectionCommon; /* Public data */ -/* Written out exactly in this order by SaveSettings() */ /* [ Common ] */ /* one line: "OpenGPGCheck = value" */ diff --git a/src/daemon/Settings.h b/src/daemon/Settings.h index 49790e01..05e7e907 100644 --- a/src/daemon/Settings.h +++ b/src/daemon/Settings.h @@ -22,11 +22,18 @@ #include "abrt_types.h" #include <glib.h> +#ifdef __cplusplus + typedef map_map_string_t map_abrt_settings_t; +void SetSettings(const map_abrt_settings_t& pSettings, const char *dbus_sender); +map_abrt_settings_t GetSettings(); + +extern "C" { +#endif -extern GList *g_settings_setOpenGPGPublicKeys; -extern GList *g_settings_setBlackListedPkgs; -extern GList *g_settings_setBlackListedPaths; +extern GList * g_settings_setOpenGPGPublicKeys; +extern GList * g_settings_setBlackListedPkgs; +extern GList * g_settings_setBlackListedPaths; extern unsigned int g_settings_nMaxCrashReportsSize; extern bool g_settings_bOpenGPGCheck; extern bool g_settings_bProcessUnpackaged; @@ -35,10 +42,11 @@ extern char * g_settings_sWatchCrashdumpArchiveDir; extern char * g_settings_sLogScanners; int LoadSettings(); -void SaveSettings(); -void SetSettings(const map_abrt_settings_t& pSettings, const char * dbus_sender); -map_abrt_settings_t GetSettings(); void settings_free(); +#ifdef __cplusplus +} +#endif + #endif diff --git a/src/daemon/abrt-action-save-package-data.cpp b/src/daemon/abrt-action-save-package-data.c index cb880bd3..cb880bd3 100644 --- a/src/daemon/abrt-action-save-package-data.cpp +++ b/src/daemon/abrt-action-save-package-data.c |