use get_crash_data_item_content() more widely. -4k.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

3 files changed, 6 insertions, 6 deletions

diff --git a/src/Daemon/CommLayerServerDBus.cpp b/src/Daemon/CommLayerServerDBus.cpp
index 22d1bd0f..fef8c578 100644
--- a/src/Daemon/CommLayerServerDBus.cpp
+++ b/src/Daemon/CommLayerServerDBus.cpp
@@ -215,8 +215,8 @@ static int handle_Report(DBusMessage* call, DBusMessage* reply)
     }
 
     map_crash_data_t::const_iterator it_comment = argin1.find(CD_COMMENT);
-    map_crash_data_t::const_iterator it_reproduce = argin1.find(CD_REPRODUCE);
     const char* comment = (it_comment != argin1.end()) ? it_comment->second[CD_CONTENT].c_str() : "";
+    map_crash_data_t::const_iterator it_reproduce = argin1.find(CD_REPRODUCE);
     const char* reproduce = (it_reproduce != argin1.end()) ? it_reproduce->second[CD_CONTENT].c_str() : "";
     const char* errmsg = NULL;
     if (strlen(comment) > LIMIT_MESSAGE)
diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp
index 50d0acae..4f24ee11 100644
--- a/src/Daemon/MiddleWare.cpp
+++ b/src/Daemon/MiddleWare.cpp
@@ -444,10 +444,10 @@ report_status_t Report(const map_crash_data_t& pCrashData,
         throw CABRTException(EXCEP_ERROR, "Report(): Some of mandatory report data are missing.");
     }
 
-    std::string analyzer = pCrashData.find(CD_MWANALYZER)->second[CD_CONTENT];
-    std::string UID = pCrashData.find(CD_MWUID)->second[CD_CONTENT];
-    std::string UUID = pCrashData.find(CD_MWUUID)->second[CD_CONTENT];
-    std::string packageNVR = pCrashData.find(FILENAME_PACKAGE)->second[CD_CONTENT];
+    const std::string& analyzer    = get_crash_data_item_content(pCrashData, CD_MWANALYZER);
+    const std::string& UID         = get_crash_data_item_content(pCrashData, CD_MWUID);
+    const std::string& UUID        = get_crash_data_item_content(pCrashData, CD_MWUUID);
+    const std::string& packageNVR  = get_crash_data_item_content(pCrashData, FILENAME_PACKAGE);
     std::string packageName = packageNVR.substr(0, packageNVR.rfind("-", packageNVR.rfind("-") - 1));
 
     // Save comment and "how to reproduce"
diff --git a/src/Daemon/Settings.cpp b/src/Daemon/Settings.cpp
index 48658e28..73736f13 100644
--- a/src/Daemon/Settings.cpp
+++ b/src/Daemon/Settings.cpp
@@ -146,8 +146,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());