diff options
| author | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-01-21 21:20:33 +0100 |
|---|---|---|
| committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-01-21 21:20:33 +0100 |
| commit | ce57d1299f6dadecb36c597e35c00de79d00c5f4 (patch) | |
| tree | 0a900704b79558b4f1683debc9b36fd62b2f2c5b /src/Daemon/Settings.cpp | |
| parent | f750288769b23497ad5b57b1c50f683402c509f6 (diff) | |
| parent | 4b54f9866f0dbdc859e300b0169b6ef504ee6c12 (diff) | |
| download | abrt-ce57d1299f6dadecb36c597e35c00de79d00c5f4.tar.gz abrt-ce57d1299f6dadecb36c597e35c00de79d00c5f4.tar.xz abrt-ce57d1299f6dadecb36c597e35c00de79d00c5f4.zip | |
Merge branch 'master' into rhel6
Conflicts:
src/Daemon/abrt.conf
Diffstat (limited to 'src/Daemon/Settings.cpp')
| -rw-r--r-- | src/Daemon/Settings.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Daemon/Settings.cpp b/src/Daemon/Settings.cpp index 48658e2..6cf32a6 100644 --- a/src/Daemon/Settings.cpp +++ b/src/Daemon/Settings.cpp @@ -77,7 +77,7 @@ static set_string_t ParseList(const char* pList) return set; } -/* (What format do we parse here?) */ +/* Format: name, name(param),name("param with spaces \"and quotes\"") */ static vector_pair_string_string_t ParseListWithArgs(const char *pValue) { VERB3 log(" ParseListWithArgs(%s)", pValue); @@ -92,7 +92,6 @@ static vector_pair_string_string_t ParseListWithArgs(const char *pValue) { if (is_quote && pValue[ii] == '\\' && pValue[ii+1]) { - item += pValue[ii]; ii++; item += pValue[ii]; continue; @@ -100,7 +99,7 @@ static vector_pair_string_string_t ParseListWithArgs(const char *pValue) if (pValue[ii] == '"') { is_quote = !is_quote; - item += pValue[ii]; + /*item += pValue[ii]; - wrong! name("param") must be == name(param) */ continue; } if (is_quote) @@ -146,8 +145,8 @@ static vector_pair_string_string_t ParseListWithArgs(const char *pValue) static void ParseCommon() { - map_string_t::const_iterator it = s_mapSectionCommon.find("OpenGPGCheck"); map_string_t::const_iterator end = s_mapSectionCommon.end(); + map_string_t::const_iterator it = s_mapSectionCommon.find("OpenGPGCheck"); if (it != end) { g_settings_bOpenGPGCheck = string_to_bool(it->second.c_str()); |