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

24 files changed, 45 insertions, 41 deletions

diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp
index 8a318d30..fecbd270 100644
--- a/lib/Plugins/Bugzilla.cpp
+++ b/lib/Plugins/Bugzilla.cpp
@@ -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;
diff --git a/lib/Plugins/Bugzilla.h b/lib/Plugins/Bugzilla.h
index 9130a698..ee6bc6a5 100644
--- a/lib/Plugins/Bugzilla.h
+++ b/lib/Plugins/Bugzilla.h
@@ -22,7 +22,7 @@ class CReporterBugzilla : public CReporter
 
         virtual std::string Report(const map_crash_report_t& pCrashReport,
                                    const map_plugin_settings_t& pSettings,
-                                   const std::string& pArgs);
+                                   const char *pArgs);
 
         virtual void SetSettings(const map_plugin_settings_t& pSettings);
         virtual const map_plugin_settings_t& GetSettings();
diff --git a/lib/Plugins/Catcut.cpp b/lib/Plugins/Catcut.cpp
index 7add58c0..9974faa9 100644
--- a/lib/Plugins/Catcut.cpp
+++ b/lib/Plugins/Catcut.cpp
@@ -436,7 +436,7 @@ CReporterCatcut::~CReporterCatcut()
 
 string CReporterCatcut::Report(const map_crash_report_t& pCrashReport,
                                const map_plugin_settings_t& pSettings,
-                               const string& pArgs)
+                               const char *pArgs)
 {
     update_client(_("Creating new bug..."));
     try
diff --git a/lib/Plugins/Catcut.h b/lib/Plugins/Catcut.h
index 4fb89e22..00f486c0 100644
--- a/lib/Plugins/Catcut.h
+++ b/lib/Plugins/Catcut.h
@@ -22,7 +22,7 @@ class CReporterCatcut : public CReporter
 
         virtual std::string Report(const map_crash_report_t& pCrashReport,
                                    const map_plugin_settings_t& pSettings,
-                                   const std::string& pArgs);
+                                   const char *Args);
 };
 
 #endif /* CATCUT_H_ */
diff --git a/lib/Plugins/KerneloopsReporter.cpp b/lib/Plugins/KerneloopsReporter.cpp
index 376db25a..29094e85 100644
--- a/lib/Plugins/KerneloopsReporter.cpp
+++ b/lib/Plugins/KerneloopsReporter.cpp
@@ -95,7 +95,7 @@ CKerneloopsReporter::CKerneloopsReporter() :
 
 std::string CKerneloopsReporter::Report(const map_crash_report_t& pCrashReport,
                                         const map_plugin_settings_t& pSettings,
-                                        const std::string& pArgs)
+                                        const char *pArgs)
 {
 	int ret = -1;
 
diff --git a/lib/Plugins/KerneloopsReporter.h b/lib/Plugins/KerneloopsReporter.h
index af82afbe..10e5e644 100644
--- a/lib/Plugins/KerneloopsReporter.h
+++ b/lib/Plugins/KerneloopsReporter.h
@@ -44,8 +44,8 @@ class CKerneloopsReporter : public CReporter
 //ok to delete?
 //		virtual const map_plugin_settings_t& GetSettings();
 		virtual std::string Report(const map_crash_report_t& pCrashReport,
-                                   const map_plugin_settings_t& pSettings,
-				                   const std::string& pArgs);
+                                const map_plugin_settings_t& pSettings,
+				const char *pArgs);
 };
 
 #endif
diff --git a/lib/Plugins/Logger.cpp b/lib/Plugins/Logger.cpp
index 9f261a38..35f042c7 100644
--- a/lib/Plugins/Logger.cpp
+++ b/lib/Plugins/Logger.cpp
@@ -60,7 +60,8 @@ void CLogger::SetSettings(const map_plugin_settings_t& pSettings)
 //}
 
 std::string CLogger::Report(const map_crash_report_t& pCrashReport,
-                            const map_plugin_settings_t& pSettings, const std::string& pArgs)
+                const map_plugin_settings_t& pSettings,
+                const char *pArgs)
 {
     update_client(_("Creating a report..."));
 
@@ -84,7 +85,7 @@ std::string CLogger::Report(const map_crash_report_t& pCrashReport,
         return "file://" + m_sLogPath;
     }
 
-    throw CABRTException(EXCEP_PLUGIN, "Can't open file '%s'", m_sLogPath);
+    throw CABRTException(EXCEP_PLUGIN, "Can't open file '%s'", m_sLogPath.c_str());
 }
 
 PLUGIN_INFO(REPORTER,
diff --git a/lib/Plugins/Logger.h b/lib/Plugins/Logger.h
index 285e25ba..c7d76798 100644
--- a/lib/Plugins/Logger.h
+++ b/lib/Plugins/Logger.h
@@ -39,7 +39,7 @@ class CLogger : public CReporter
 //        virtual const map_plugin_settings_t& GetSettings();
         virtual std::string Report(const map_crash_report_t& pCrashReport,
                                    const map_plugin_settings_t& pSettings,
-                                   const std::string& pArgs);
+                                   const char *pArgs);
 };
 
 #endif /* LOGGER_H_ */
diff --git a/lib/Plugins/Mailx.cpp b/lib/Plugins/Mailx.cpp
index dc6e2b0e..26b6ec41 100644
--- a/lib/Plugins/Mailx.cpp
+++ b/lib/Plugins/Mailx.cpp
@@ -84,7 +84,8 @@ static char** append_str_to_vector(char **vec, unsigned &size, const char *str)
 }
 
 std::string CMailx::Report(const map_crash_report_t& pCrashReport,
-                           const map_plugin_settings_t& pSettings, const std::string& pArgs)
+                const map_plugin_settings_t& pSettings,
+                const char *pArgs)
 {
     char **args = NULL;
     unsigned arg_size = 0;
@@ -156,7 +157,7 @@ std::string CMailx::Report(const map_crash_report_t& pCrashReport,
     emailBody += '\n';
 
     args = append_str_to_vector(args, arg_size, "-s");
-    args = append_str_to_vector(args, arg_size, (pArgs != "" ? pArgs.c_str() : m_sSubject.c_str()));
+    args = append_str_to_vector(args, arg_size, (pArgs[0] != '\0' ? pArgs : m_sSubject.c_str()));
     args = append_str_to_vector(args, arg_size, "-r");
     args = append_str_to_vector(args, arg_size, m_sEmailFrom.c_str());
     args = append_str_to_vector(args, arg_size, m_sEmailTo.c_str());
diff --git a/lib/Plugins/Mailx.h b/lib/Plugins/Mailx.h
index d6d66bd8..1ddb5ff0 100644
--- a/lib/Plugins/Mailx.h
+++ b/lib/Plugins/Mailx.h
@@ -43,7 +43,7 @@ class CMailx : public CReporter
 //        virtual const map_plugin_settings_t& GetSettings();
         virtual std::string Report(const map_crash_report_t& pCrashReport,
                                    const map_plugin_settings_t& pSettings,
-                                   const std::string& pArgs);
+                                   const char *pArgs);
 };
 
 #endif
diff --git a/lib/Plugins/TicketUploader.cpp b/lib/Plugins/TicketUploader.cpp
index 687e7062..6d281312 100644
--- a/lib/Plugins/TicketUploader.cpp
+++ b/lib/Plugins/TicketUploader.cpp
@@ -156,7 +156,8 @@ void CTicketUploader::SendFile(const char *pURL, const char *pFilename)
 
 
 string CTicketUploader::Report(const map_crash_report_t& pCrashReport,
-                               const map_plugin_settings_t& pSettings, const string& pArgs)
+                const map_plugin_settings_t& pSettings,
+                const char *pArgs)
 {
     update_client(_("Creating an TicketUploader report..."));
 
diff --git a/lib/Plugins/TicketUploader.h b/lib/Plugins/TicketUploader.h
index 2a7c98af..e00596f2 100644
--- a/lib/Plugins/TicketUploader.h
+++ b/lib/Plugins/TicketUploader.h
@@ -51,7 +51,7 @@ class CTicketUploader : public CReporter
 
         virtual std::string Report(const map_crash_report_t& pCrashReport,
                               const map_plugin_settings_t& pSettings,
-                              const std::string& pArgs);
+                              const char *pArgs);
 };
 
 #endif
diff --git a/lib/Utils/Reporter.h b/lib/Utils/Reporter.h
index f2788993..0a06a7c9 100644
--- a/lib/Utils/Reporter.h
+++ b/lib/Utils/Reporter.h
@@ -42,7 +42,7 @@ class CReporter : public CPlugin
          */
         virtual std::string Report(const map_crash_report_t& pCrashReport,
                                    const map_plugin_settings_t& pSettings,
-                                   const std::string& pArgs) = 0;
+                                   const char *pArgs) = 0;
 };
 
 #endif /* REPORTER_H_ */
diff --git a/src/Applet/CCApplet.cpp b/src/Applet/CCApplet.cpp
index c91b4e82..b73b41d0 100644
--- a/src/Applet/CCApplet.cpp
+++ b/src/Applet/CCApplet.cpp
@@ -349,7 +349,7 @@ bool CApplet::load_icons()
 }
 
 
-//int CApplet::AddEvent(int pUUID, const std::string& pProgname)
+//int CApplet::AddEvent(int pUUID, const char *pProgname)
 //{
 //    m_mapEvents[pUUID] = "pProgname";
 //    SetIconTooltip(_("Pending events: %i"), m_mapEvents.size());
diff --git a/src/Applet/CCApplet.h b/src/Applet/CCApplet.h
index c5396a72..6c47c0a1 100644
--- a/src/Applet/CCApplet.h
+++ b/src/Applet/CCApplet.h
@@ -71,7 +71,7 @@ class CApplet
         // or ask the daemon every time?
         // maybe just events which occured during current session
         // map::
-//        int AddEvent(int pUUID, const std::string& pProgname);
+//        int AddEvent(int pUUID, const char *pProgname);
 //        int RemoveEvent(int pUUID);
 
     protected:
diff --git a/src/Backtrace/main.c b/src/Backtrace/main.c
index 9be93ca5..8add8c42 100644
--- a/src/Backtrace/main.c
+++ b/src/Backtrace/main.c
@@ -148,7 +148,7 @@ int main(int argc, char **argv)
 
     if (size > FILE_SIZE_LIMIT)
     {
-      fprintf(stderr, "Input file too big (%zd). Maximum size is %zd.\n", 
+      fprintf(stderr, "Input file too big (%zd). Maximum size is %d.\n", 
               size, FILE_SIZE_LIMIT);
       exit(EX_IOERR);
     }
diff --git a/src/CLI/ABRTSocket.h b/src/CLI/ABRTSocket.h
index 5d5383fa..536e4b50 100644
--- a/src/CLI/ABRTSocket.h
+++ b/src/CLI/ABRTSocket.h
@@ -10,20 +10,20 @@ class CABRTSocket
     private:
         int m_nSocket;
 
-        void Send(const std::string& pMessage);
+        void Send(const char *pMessage);
         void Recv(std::string& pMessage);
 
     public:
         CABRTSocket();
         ~CABRTSocket();
 
-        void Connect(const std::string& pPath);
+        void Connect(const char *pPath);
         void Disconnect();
 
         vector_crash_infos_t GetCrashInfos();
-        map_crash_report_t CreateReport(const std::string& pUUID);
+        map_crash_report_t CreateReport(const char *pUUID);
         void Report(const map_crash_report_t& pReport);
-        void DeleteDebugDump(const std::string& pUUID);
+        void DeleteDebugDump(const char *pUUID);
 };
 
 #endif /* ABRTSOCKET_H_ */
diff --git a/src/Daemon/CommLayerServer.h b/src/Daemon/CommLayerServer.h
index 21c1b304..367c0956 100644
--- a/src/Daemon/CommLayerServer.h
+++ b/src/Daemon/CommLayerServer.h
@@ -17,8 +17,8 @@ class CCommLayerServer {
         virtual void JobDone(const char* pDest, const char* pUUID) = 0;
         virtual void QuotaExceed(const char* str) {}
 
-        virtual void Update(const std::string& pMessage, const char* peer, uint64_t pJobID) {};
-        virtual void Warning(const std::string& pMessage, const char* peer, uint64_t pJobID) {};
+        virtual void Update(const char* pMessage, const char* peer, uint64_t pJobID) {};
+        virtual void Warning(const char* pMessage, const char* peer, uint64_t pJobID) {};
 };
 
 #endif
diff --git a/src/Daemon/CommLayerServerDBus.cpp b/src/Daemon/CommLayerServerDBus.cpp
index 27a18c24..646974dd 100644
--- a/src/Daemon/CommLayerServerDBus.cpp
+++ b/src/Daemon/CommLayerServerDBus.cpp
@@ -88,23 +88,21 @@ void CCommLayerServerDBus::JobDone(const char* peer, const char* pUUID)
     send_flush_and_unref(msg);
 }
 
-void CCommLayerServerDBus::Update(const std::string& pMessage, const char* peer, uint64_t job_id)
+void CCommLayerServerDBus::Update(const char* pMessage, const char* peer, uint64_t job_id)
 {
     DBusMessage* msg = new_signal_msg("Update", peer);
-    const char* c_message = pMessage.c_str();
     dbus_message_append_args(msg,
-            DBUS_TYPE_STRING, &c_message,
+            DBUS_TYPE_STRING, &pMessage,
             DBUS_TYPE_UINT64, &job_id, /* TODO: redundant parameter, remove from API */
             DBUS_TYPE_INVALID);
     send_flush_and_unref(msg);
 }
 
-void CCommLayerServerDBus::Warning(const std::string& pMessage, const char* peer, uint64_t job_id)
+void CCommLayerServerDBus::Warning(const char* pMessage, const char* peer, uint64_t job_id)
 {
     DBusMessage* msg = new_signal_msg("Warning", peer);
-    const char* c_message = pMessage.c_str();
     dbus_message_append_args(msg,
-            DBUS_TYPE_STRING, &c_message,
+            DBUS_TYPE_STRING, &pMessage,
             DBUS_TYPE_UINT64, &job_id, /* TODO: redundant parameter, remove from API */
             DBUS_TYPE_INVALID);
     send_flush_and_unref(msg);
diff --git a/src/Daemon/CommLayerServerDBus.h b/src/Daemon/CommLayerServerDBus.h
index f159c732..9bd77666 100644
--- a/src/Daemon/CommLayerServerDBus.h
+++ b/src/Daemon/CommLayerServerDBus.h
@@ -15,8 +15,8 @@ class CCommLayerServerDBus
         virtual void JobDone(const char* pDest, const char* pUUID);
         virtual void QuotaExceed(const char* str);
 
-        virtual void Update(const std::string& pMessage, const char* peer, uint64_t pJobID);
-        virtual void Warning(const std::string& pMessage, const char* peer, uint64_t pJobID);
+        virtual void Update(const char* pMessage, const char* peer, uint64_t pJobID);
+        virtual void Warning(const char* pMessage, const char* peer, uint64_t pJobID);
 };
 
 #endif
diff --git a/src/Daemon/CommLayerServerSocket.h b/src/Daemon/CommLayerServerSocket.h
index d1f464cc..753b67af 100644
--- a/src/Daemon/CommLayerServerSocket.h
+++ b/src/Daemon/CommLayerServerSocket.h
@@ -26,9 +26,9 @@ class CCommLayerServerSocket : public CCommLayerServer
         CCommLayerServerSocket();
         virtual ~CCommLayerServerSocket();
 
-        virtual vector_crash_infos_t GetCrashInfos(const std::string& pSender);
-        virtual report_status_t Report(const map_crash_report_t& pReport, const std::string& pSender);
-        virtual void DeleteDebugDump(const std::string& pUUID, const std::string& pSender);
+        virtual vector_crash_infos_t GetCrashInfos(const char *pSender);
+        virtual report_status_t Report(const map_crash_report_t& pReport, const char *pSender);
+        virtual void DeleteDebugDump(const char *pUUID, const char *pSender);
 
-        virtual void Crash(const std::string& arg1);
+        virtual void Crash(const char *arg1);
 };
diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp
index 2973cfcc..3684d600 100644
--- a/src/Daemon/CrashWatcher.cpp
+++ b/src/Daemon/CrashWatcher.cpp
@@ -73,6 +73,8 @@ vector_crash_infos_t GetCrashInfos(const char *pUID)
                     /* Deletes both DB record and dump dir */
                     DeleteDebugDump(uuid, uid);
                     break;
+                default:
+                    break;
             }
         }
     }
diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am
index fc4f5e20..18fcd816 100644
--- a/src/Daemon/Makefile.am
+++ b/src/Daemon/Makefile.am
@@ -26,7 +26,8 @@ abrtd_CPPFLAGS = \
     $(DBUS_CFLAGS) \
     $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \
     $(ENABLE_SOCKET_OR_DBUS) \
-    -D_GNU_SOURCE
+    -D_GNU_SOURCE \
+    -Wall
 abrtd_LDADD = \
     ../../lib/Utils/libABRTUtils.la \
     ../../lib/Utils/libABRTdUtils.la \
diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp
index 8528f644..e7757648 100644
--- a/src/Daemon/MiddleWare.cpp
+++ b/src/Daemon/MiddleWare.cpp
@@ -348,7 +348,7 @@ void RunActionsAndReporters(const char *pDebugDumpDir)
                 map_crash_report_t crashReport;
                 DebugDumpToCrashReport(pDebugDumpDir, crashReport);
                 VERB2 log("%s.Report(...)", it_ar->first.c_str());
-                reporter->Report(crashReport, plugin_settings, it_ar->second);
+                reporter->Report(crashReport, plugin_settings, it_ar->second.c_str());
             }
             else if (tp == ACTION)
             {
@@ -490,7 +490,7 @@ report_status_t Report(const map_crash_report_t& pCrashReport,
                     }
 #endif
                     map_plugin_settings_t plugin_settings = pSettings[pluginName];
-                    std::string res = reporter->Report(pCrashReport, plugin_settings, it_r->second);
+                    std::string res = reporter->Report(pCrashReport, plugin_settings, it_r->second.c_str());
 
 #if 0 /* Using ~user/.abrt/ is bad wrt security */
                     if (home != "")
@@ -688,7 +688,7 @@ void autoreport(const pair_string_string_t& reporter_options, const map_crash_re
     }
 
     map_plugin_settings_t plugin_settings;
-    std::string res = reporter->Report(crash_report, plugin_settings, reporter_options.second);
+    std::string res = reporter->Report(crash_report, plugin_settings, reporter_options.second.c_str());
 }
 
 /**