On Wed, 2010-05-05 at 16:48 +0200, Nikola Pajkovsky wrote:
Signed-off-by: Nikola Pajkovsky <npajkovs(a)redhat.com>
---
src/Daemon/Settings.cpp | 35 -----------------------------------
1 files changed, 0 insertions(+), 35 deletions(-)
diff --git a/src/Daemon/Settings.cpp b/src/Daemon/Settings.cpp
index 99a5c8d..4fe6276 100644
--- a/src/Daemon/Settings.cpp
+++ b/src/Daemon/Settings.cpp
@@ -464,38 +464,9 @@ static void SaveBool(const char* pKey, bool pBool, FILE* pFOut)
fprintf(pFOut, "%s = %s\n", pKey, (pBool ? "yes" :
"no"));
}
-/* Rewrite .conf file */
-void SaveSettings()
-{
- FILE* fOut = fopen(CONF_DIR"/abrt.conf.NEW", "w");
-
- if (fOut)
- {
- SaveSectionHeader(SECTION_COMMON, fOut);
- SaveBool("OpenGPGCheck", g_settings_bOpenGPGCheck, fOut);
- SaveSetString("OpenGPGPublicKeys", g_settings_setOpenGPGPublicKeys,
fOut);
- SaveSetString("BlackList", g_settings_mapBlackList, fOut);
- fprintf(fOut, "Database = %s\n", g_settings_sDatabase.c_str());
- fprintf(fOut, "MaxCrashReportsSize = %u\n",
g_settings_nMaxCrashReportsSize);
- SaveVectorPairStrings("ActionsAndReporters",
g_settings_vectorActionsAndReporters, fOut);
- SaveSectionHeader(SECTION_ANALYZER_ACTIONS_AND_REPORTERS, fOut);
- SaveMapVectorPairStrings(g_settings_mapAnalyzerActionsAndReporters, fOut);
- SaveSectionHeader(SECTION_CRON, fOut);
- SaveMapVectorPairStrings(g_settings_mapCron, fOut);
- if (fclose(fOut) == 0 && rename(CONF_DIR"/abrt.conf.NEW",
CONF_DIR"/abrt.conf") == 0)
- {
- return; /* success */
- }
- }
- perror_msg("Error saving '%s'", CONF_DIR"/abrt.conf");
- if (fOut)
- unlink(CONF_DIR"/abrt.conf.NEW");
-}
-
/* dbus call to change some .conf file data */
void SetSettings(const map_abrt_settings_t& pSettings, const char *dbus_sender)
{
- bool dirty = false;
int polkit_result;
polkit_result = polkit_check_authorization(dbus_sender,
@@ -513,14 +484,12 @@ void SetSettings(const map_abrt_settings_t& pSettings, const
char *dbus_sender)
{
s_mapSectionCommon = it->second;
ParseCommon();
- dirty = true;
}
it = pSettings.find(SECTION_ANALYZER_ACTIONS_AND_REPORTERS);
if (it != end)
{
s_mapSectionAnalyzerActionsAndReporters = it->second;
ParseAnalyzerActionsAndReporters();
- dirty = true;
}
it = pSettings.find(SECTION_CRON);
if (it != end)
@@ -529,8 +498,4 @@ void SetSettings(const map_abrt_settings_t& pSettings, const char
*dbus_sender)
ParseCron();
dirty = true;
}
- if (dirty)
- {
- SaveSettings();
- }
}
Settings.cpp: In function 'void SaveVectorPairStrings(const char*, const
vector_pair_string_string_t&, FILE*)':
Settings.cpp:435: warning: comparison between signed and unsigned integer expressions
Settings.cpp: In function 'void SetSettings(const map_abrt_settings_t&, const
char*)':
Settings.cpp:499: error: 'dirty' was not declared in this scope
Settings.cpp: At global scope:
Settings.cpp:415: warning: 'void SaveSetString(const char*, const set_string_t&,
FILE*)' defined but not used
Settings.cpp:447: warning: 'void SaveMapVectorPairStrings(const
map_vector_pair_string_string_t&, FILE*)' defined but not used
Settings.cpp:457: warning: 'void SaveSectionHeader(const char*, FILE*)' defined
but not used
Settings.cpp:462: warning: 'void SaveBool(const char*, bool, FILE*)' defined but
not used
make[3]: *** [abrtd-Settings.o] Error 1
make[3]: *** Waiting for unfinished jobs....
mv -f .deps/abrtd-CommLayerServerDBus.Tpo .deps/abrtd-CommLayerServerDBus.Po
make[3]: Leaving directory `/builddir/build/BUILD/abrt-1.1.0/src/Daemon'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/builddir/build/BUILD/abrt-1.1.0/src'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/builddir/build/BUILD/abrt-1.1.0'
make: *** [all] Error 2
--
vda