Merge branch 'master' of git://git.fedorahosted.org/git/abrt

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp
index f17f9a74..2d065f67 100644
--- a/lib/Plugins/Bugzilla.cpp
+++ b/lib/Plugins/Bugzilla.cpp
@@ -52,7 +52,7 @@ void ctx::login(const char* login, const char* passwd)
         std::string errmsg = ssprintf("Can't login. Check Edit->Plugins->Bugzilla and /etc/abrt/plugins/Bugzilla.conf. Server said: %s", env.fault_string);
         xmlrpc_env_clean(&env);
         error_msg("%s", errmsg.c_str()); // show error in daemon log
-        throw CABRTException(EXCEP_PLUGIN, errmsg);
+        throw CABRTException(EXCEP_PLUGIN, errmsg.c_str());
     }
 }
 
@@ -287,7 +287,7 @@ void ctx::add_attachments(const char* bug_id_str, const map_crash_report_t& pCra
         if (type == CD_ATT)
         {
             char *encoded64 = encode_base64(content.c_str(), content.length());
-            xmlrpc_value* param = xmlrpc_build_value(&env,"(s{s:s,s:s,s:s,s:s})",
+            xmlrpc_value* param = xmlrpc_build_value(&env, "(s{s:s,s:s,s:s,s:s})",
                                               bug_id_str,
                                               "description", ("File: " + filename).c_str(),
                                               "filename", filename.c_str(),
@@ -323,7 +323,7 @@ CReporterBugzilla::~CReporterBugzilla()
 
 std::string CReporterBugzilla::Report(const map_crash_report_t& pCrashReport,
                                       const map_plugin_settings_t& pSettings,
-                                      const std::string& pArgs)
+                                      const char *pArgs)
 {
     int32_t bug_id = -1;
     std::string Login;
@@ -483,7 +483,7 @@ void CReporterBugzilla::SetSettings(const map_plugin_settings_t& pSettings)
             m_sBugzillaURL.erase(m_sBugzillaURL.length() - 1);
         }
         /*
-        if(*(--m_sBugzillaURL.end()) == '/')
+        if (*(--m_sBugzillaURL.end()) == '/')
         {
             m_sBugzillaURL.erase(--m_sBugzillaURL.end());
         }