diff options
Diffstat (limited to 'lib/Plugins')
-rw-r--r-- | lib/Plugins/Bugzilla.cpp | 14 | ||||
-rw-r--r-- | lib/Plugins/Bugzilla.h | 5 | ||||
-rw-r--r-- | lib/Plugins/CCpp.cpp | 14 | ||||
-rw-r--r-- | lib/Plugins/CCpp.h | 3 | ||||
-rw-r--r-- | lib/Plugins/Catcut.cpp | 14 | ||||
-rw-r--r-- | lib/Plugins/Catcut.h | 2 | ||||
-rw-r--r-- | lib/Plugins/FileTransfer.cpp | 14 | ||||
-rw-r--r-- | lib/Plugins/FileTransfer.h | 2 | ||||
-rw-r--r-- | lib/Plugins/Kerneloops.cpp | 10 | ||||
-rw-r--r-- | lib/Plugins/Kerneloops.h | 5 | ||||
-rw-r--r-- | lib/Plugins/KerneloopsReporter.cpp | 8 | ||||
-rw-r--r-- | lib/Plugins/KerneloopsReporter.h | 2 | ||||
-rw-r--r-- | lib/Plugins/KerneloopsScanner.cpp | 10 | ||||
-rw-r--r-- | lib/Plugins/KerneloopsScanner.h | 5 | ||||
-rw-r--r-- | lib/Plugins/Logger.cpp | 10 | ||||
-rw-r--r-- | lib/Plugins/Logger.h | 2 | ||||
-rw-r--r-- | lib/Plugins/Mailx.cpp | 14 | ||||
-rw-r--r-- | lib/Plugins/Mailx.h | 2 | ||||
-rw-r--r-- | lib/Plugins/SQLite3.cpp | 8 | ||||
-rw-r--r-- | lib/Plugins/SQLite3.h | 2 | ||||
-rw-r--r-- | lib/Plugins/TicketUploader.cpp | 23 | ||||
-rw-r--r-- | lib/Plugins/TicketUploader.h | 2 |
22 files changed, 60 insertions, 111 deletions
diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp index 18ab5c87..ecd4dd67 100644 --- a/lib/Plugins/Bugzilla.cpp +++ b/lib/Plugins/Bugzilla.cpp @@ -618,16 +618,14 @@ void CReporterBugzilla::SetSettings(const map_plugin_settings_t& pSettings) } } -map_plugin_settings_t CReporterBugzilla::GetSettings() +const map_plugin_settings_t& CReporterBugzilla::GetSettings() { - map_plugin_settings_t ret; + m_pSettings["BugzillaURL"] = m_sBugzillaURL; + m_pSettings["Login"] = m_sLogin; + m_pSettings["Password"] = m_sPassword; + m_pSettings["NoSSLVerify"] = m_bNoSSLVerify ? "yes" : "no"; - ret["BugzillaURL"] = m_sBugzillaURL; - ret["Login"] = m_sLogin; - ret["Password"] = m_sPassword; - ret["NoSSLVerify"] = m_bNoSSLVerify ? "yes" : "no"; - - return ret; + return m_pSettings; } PLUGIN_INFO(REPORTER, diff --git a/lib/Plugins/Bugzilla.h b/lib/Plugins/Bugzilla.h index 702eead2..55a5f5f0 100644 --- a/lib/Plugins/Bugzilla.h +++ b/lib/Plugins/Bugzilla.h @@ -8,20 +8,19 @@ class CReporterBugzilla : public CReporter { private: bool m_bNoSSLVerify; - std::string m_sBugzillaURL; std::string m_sBugzillaXMLRPC; std::string m_sLogin; std::string m_sPassword; std::string m_sAttchmentInBase64; - + map_plugin_settings_t parse_settings(const map_plugin_settings_t& pSettings); public: CReporterBugzilla(); virtual ~CReporterBugzilla(); virtual void SetSettings(const map_plugin_settings_t& pSettings); - virtual map_plugin_settings_t GetSettings(); + 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); diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp index b6a5db85..4b73938c 100644 --- a/lib/Plugins/CCpp.cpp +++ b/lib/Plugins/CCpp.cpp @@ -975,16 +975,14 @@ void CAnalyzerCCpp::SetSettings(const map_plugin_settings_t& pSettings) } } -map_plugin_settings_t CAnalyzerCCpp::GetSettings() +const map_plugin_settings_t& CAnalyzerCCpp::GetSettings() { - map_plugin_settings_t ret = m_pSettings; + m_pSettings["MemoryMap"] = m_bMemoryMap ? "yes" : "no"; + m_pSettings["DebugInfo"] = m_sDebugInfo; + m_pSettings["DebugInfoCacheMB"] = to_string(m_nDebugInfoCacheMB); + m_pSettings["InstallDebugInfo"] = m_bInstallDebugInfo ? "yes" : "no"; - ret["MemoryMap"] = m_bMemoryMap ? "yes" : "no"; - ret["DebugInfo"] = m_sDebugInfo; - ret["DebugInfoCacheMB"] = to_string(m_nDebugInfoCacheMB); - ret["InstallDebugInfo"] = m_bInstallDebugInfo ? "yes" : "no"; - - return ret; + return m_pSettings; } PLUGIN_INFO(ANALYZER, diff --git a/lib/Plugins/CCpp.h b/lib/Plugins/CCpp.h index a768c0a5..e2abdece 100644 --- a/lib/Plugins/CCpp.h +++ b/lib/Plugins/CCpp.h @@ -35,7 +35,6 @@ class CAnalyzerCCpp : public CAnalyzer unsigned m_nDebugInfoCacheMB; std::string m_sOldCorePattern; std::string m_sDebugInfo; - map_plugin_settings_t m_pSettings; public: CAnalyzerCCpp(); @@ -45,7 +44,7 @@ class CAnalyzerCCpp : public CAnalyzer virtual void Init(); virtual void DeInit(); virtual void SetSettings(const map_plugin_settings_t& pSettings); - virtual map_plugin_settings_t GetSettings(); + virtual const map_plugin_settings_t& GetSettings(); }; #endif /* CCPP */ diff --git a/lib/Plugins/Catcut.cpp b/lib/Plugins/Catcut.cpp index 23b1d2c4..13fa8a41 100644 --- a/lib/Plugins/Catcut.cpp +++ b/lib/Plugins/Catcut.cpp @@ -348,16 +348,14 @@ void CReporterCatcut::SetSettings(const map_plugin_settings_t& pSettings) } } -map_plugin_settings_t CReporterCatcut::GetSettings() +const map_plugin_settings_t& CReporterCatcut::GetSettings() { - map_plugin_settings_t ret; + m_pSettings["CatcutURL"] = m_sCatcutURL; + m_pSettings["Login"] = m_sLogin; + m_pSettings["Password"] = m_sPassword; + m_pSettings["NoSSLVerify"] = m_bNoSSLVerify ? "yes" : "no"; - ret["CatcutURL"] = m_sCatcutURL; - ret["Login"] = m_sLogin; - ret["Password"] = m_sPassword; - ret["NoSSLVerify"] = m_bNoSSLVerify ? "yes" : "no"; - - return ret; + return m_pSettings; } PLUGIN_INFO(REPORTER, diff --git a/lib/Plugins/Catcut.h b/lib/Plugins/Catcut.h index 40ef399d..15efdc1d 100644 --- a/lib/Plugins/Catcut.h +++ b/lib/Plugins/Catcut.h @@ -17,7 +17,7 @@ class CReporterCatcut : public CReporter virtual ~CReporterCatcut(); virtual void SetSettings(const map_plugin_settings_t& pSettings); - virtual map_plugin_settings_t GetSettings(); + virtual const map_plugin_settings_t& GetSettings(); virtual std::string Report(const map_crash_report_t& pCrashReport, const map_plugin_settings_t& pSettings, diff --git a/lib/Plugins/FileTransfer.cpp b/lib/Plugins/FileTransfer.cpp index 2220e940..72b3b16e 100644 --- a/lib/Plugins/FileTransfer.cpp +++ b/lib/Plugins/FileTransfer.cpp @@ -405,16 +405,14 @@ void CFileTransfer::SetSettings(const map_plugin_settings_t& pSettings) } } -map_plugin_settings_t CFileTransfer::GetSettings() +const map_plugin_settings_t& CFileTransfer::GetSettings() { - map_plugin_settings_t ret; + m_pSettings["URL"] = m_sURL; + m_pSettings["RetryCount"] = to_string(m_nRetryCount); + m_pSettings["RetryDelay"] = to_string(m_nRetryDelay); + m_pSettings["ArchiveType"] = m_sArchiveType; - ret["URL"] = m_sURL; - ret["RetryCount"] = to_string(m_nRetryCount); - ret["RetryDelay"] = to_string(m_nRetryDelay); - ret["ArchiveType"] = m_sArchiveType; - - return ret; + return m_pSettings; } PLUGIN_INFO(ACTION, diff --git a/lib/Plugins/FileTransfer.h b/lib/Plugins/FileTransfer.h index 526fbc3d..9caa2567 100644 --- a/lib/Plugins/FileTransfer.h +++ b/lib/Plugins/FileTransfer.h @@ -41,7 +41,7 @@ class CFileTransfer : public CAction public: CFileTransfer(); virtual void SetSettings(const map_plugin_settings_t& pSettings); - virtual map_plugin_settings_t GetSettings(); + virtual const map_plugin_settings_t& GetSettings(); virtual void Run(const char *pActionDir, const char *pArgs); }; diff --git a/lib/Plugins/Kerneloops.cpp b/lib/Plugins/Kerneloops.cpp index f2a8a591..b99183c3 100644 --- a/lib/Plugins/Kerneloops.cpp +++ b/lib/Plugins/Kerneloops.cpp @@ -63,16 +63,6 @@ std::string CAnalyzerKerneloops::GetGlobalUUID(const char *pDebugDumpDir) return GetLocalUUID(pDebugDumpDir); } -void CAnalyzerKerneloops::SetSettings(const map_plugin_settings_t& pSettings) -{ - m_pSettings = pSettings; -} - -map_plugin_settings_t CAnalyzerKerneloops::GetSettings() -{ - return m_pSettings; -} - PLUGIN_INFO(ANALYZER, CAnalyzerKerneloops, "Kerneloops", diff --git a/lib/Plugins/Kerneloops.h b/lib/Plugins/Kerneloops.h index cda223d8..9e2010c7 100644 --- a/lib/Plugins/Kerneloops.h +++ b/lib/Plugins/Kerneloops.h @@ -33,15 +33,10 @@ class CAnalyzerKerneloops : public CAnalyzer { - private: - map_plugin_settings_t m_pSettings; - public: virtual std::string GetLocalUUID(const char *pDebugDumpDir); virtual std::string GetGlobalUUID(const char *pDebugDumpDir); virtual void CreateReport(const char *pDebugDumpDir, int force) {} - virtual void SetSettings(const map_plugin_settings_t& pSettings); - virtual map_plugin_settings_t GetSettings(); }; #endif diff --git a/lib/Plugins/KerneloopsReporter.cpp b/lib/Plugins/KerneloopsReporter.cpp index 712adf0f..cfb4e050 100644 --- a/lib/Plugins/KerneloopsReporter.cpp +++ b/lib/Plugins/KerneloopsReporter.cpp @@ -124,13 +124,11 @@ void CKerneloopsReporter::SetSettings(const map_plugin_settings_t& pSettings) } } -map_plugin_settings_t CKerneloopsReporter::GetSettings() +const map_plugin_settings_t& CKerneloopsReporter::GetSettings() { - map_plugin_settings_t ret; + m_pSettings["SubmitURL"] = m_sSubmitURL; - ret["SubmitURL"] = m_sSubmitURL; - - return ret; + return m_pSettings; } PLUGIN_INFO(REPORTER, diff --git a/lib/Plugins/KerneloopsReporter.h b/lib/Plugins/KerneloopsReporter.h index 3c165920..7f6ab8cc 100644 --- a/lib/Plugins/KerneloopsReporter.h +++ b/lib/Plugins/KerneloopsReporter.h @@ -41,7 +41,7 @@ class CKerneloopsReporter : public CReporter CKerneloopsReporter(); virtual void SetSettings(const map_plugin_settings_t& pSettings); - virtual map_plugin_settings_t GetSettings(); + 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); diff --git a/lib/Plugins/KerneloopsScanner.cpp b/lib/Plugins/KerneloopsScanner.cpp index 3572ef26..8c8cd4b9 100644 --- a/lib/Plugins/KerneloopsScanner.cpp +++ b/lib/Plugins/KerneloopsScanner.cpp @@ -180,16 +180,6 @@ int CKerneloopsScanner::ScanSysLogFile(const char *filename) return cnt_FoundOopses; } -void CKerneloopsScanner::SetSettings(const map_plugin_settings_t& pSettings) -{ - m_pSettings = pSettings; -} - -map_plugin_settings_t CKerneloopsScanner::GetSettings() -{ - return m_pSettings; -} - PLUGIN_INFO(ACTION, CKerneloopsScanner, "KerneloopsScanner", diff --git a/lib/Plugins/KerneloopsScanner.h b/lib/Plugins/KerneloopsScanner.h index a2a4e4b2..9f00df21 100644 --- a/lib/Plugins/KerneloopsScanner.h +++ b/lib/Plugins/KerneloopsScanner.h @@ -33,9 +33,6 @@ class CKerneloopsScanner : public CAction { - private: - map_plugin_settings_t m_pSettings; - /* For "dumpoops" tool */ public: vector_string_t m_pOopsList; @@ -50,8 +47,6 @@ class CKerneloopsScanner : public CAction public: CKerneloopsScanner(); virtual void Run(const char *pActionDir, const char *pArgs); - virtual void SetSettings(const map_plugin_settings_t& pSettings); - virtual map_plugin_settings_t GetSettings(); }; #endif diff --git a/lib/Plugins/Logger.cpp b/lib/Plugins/Logger.cpp index 716d3a92..b2ac1ade 100644 --- a/lib/Plugins/Logger.cpp +++ b/lib/Plugins/Logger.cpp @@ -43,14 +43,12 @@ void CLogger::SetSettings(const map_plugin_settings_t& pSettings) } } -map_plugin_settings_t CLogger::GetSettings() +const map_plugin_settings_t& CLogger::GetSettings() { - map_plugin_settings_t ret; + m_pSettings["LogPath"] = m_sLogPath; + m_pSettings["AppendLogs"] = m_bAppendLogs ? "yes" : "no"; - ret["LogPath"] = m_sLogPath; - ret["AppendLogs"] = m_bAppendLogs ? "yes" : "no"; - - return ret; + return m_pSettings; } std::string CLogger::Report(const map_crash_report_t& pCrashReport, diff --git a/lib/Plugins/Logger.h b/lib/Plugins/Logger.h index 33f957db..0969bea6 100644 --- a/lib/Plugins/Logger.h +++ b/lib/Plugins/Logger.h @@ -35,7 +35,7 @@ class CLogger : public CReporter CLogger(); virtual void SetSettings(const map_plugin_settings_t& pSettings); - virtual map_plugin_settings_t GetSettings(); + 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); diff --git a/lib/Plugins/Mailx.cpp b/lib/Plugins/Mailx.cpp index ef3a8d2a..f0834049 100644 --- a/lib/Plugins/Mailx.cpp +++ b/lib/Plugins/Mailx.cpp @@ -219,16 +219,14 @@ void CMailx::SetSettings(const map_plugin_settings_t& pSettings) } } -map_plugin_settings_t CMailx::GetSettings() +const map_plugin_settings_t& CMailx::GetSettings() { - map_plugin_settings_t ret; + m_pSettings["Subject"] = m_sSubject; + m_pSettings["EmailFrom"] = m_sEmailFrom; + m_pSettings["EmailTo"] = m_sEmailTo; + m_pSettings["SendBinaryData"] = m_bSendBinaryData ? "yes" : "no"; - ret["Subject"] = m_sSubject; - ret["EmailFrom"] = m_sEmailFrom; - ret["EmailTo"] = m_sEmailTo; - ret["SendBinaryData"] = m_bSendBinaryData ? "yes" : "no"; - - return ret; + return m_pSettings; } PLUGIN_INFO(REPORTER, diff --git a/lib/Plugins/Mailx.h b/lib/Plugins/Mailx.h index e3c86e73..7af11885 100644 --- a/lib/Plugins/Mailx.h +++ b/lib/Plugins/Mailx.h @@ -47,7 +47,7 @@ class CMailx : public CReporter CMailx(); virtual void SetSettings(const map_plugin_settings_t& pSettings); - virtual map_plugin_settings_t GetSettings(); + 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); diff --git a/lib/Plugins/SQLite3.cpp b/lib/Plugins/SQLite3.cpp index d55c0a9e..ab39d040 100644 --- a/lib/Plugins/SQLite3.cpp +++ b/lib/Plugins/SQLite3.cpp @@ -404,13 +404,11 @@ void CSQLite3::SetSettings(const map_plugin_settings_t& pSettings) } } -map_plugin_settings_t CSQLite3::GetSettings() +const map_plugin_settings_t& CSQLite3::GetSettings() { - map_plugin_settings_t ret; + m_pSettings["DBPath"] = m_sDBPath; - ret["DBPath"] = m_sDBPath; - - return ret; + return m_pSettings; } PLUGIN_INFO(DATABASE, diff --git a/lib/Plugins/SQLite3.h b/lib/Plugins/SQLite3.h index e7ca8ae2..0eb3d086 100644 --- a/lib/Plugins/SQLite3.h +++ b/lib/Plugins/SQLite3.h @@ -58,7 +58,7 @@ class CSQLite3 : public CDatabase virtual database_row_t GetUUIDData(const std::string& pUUID, const std::string& pUID); virtual void SetSettings(const map_plugin_settings_t& pSettings); - virtual map_plugin_settings_t GetSettings(); + virtual const map_plugin_settings_t& GetSettings(); }; #endif /* SQLITE3_H_ */ diff --git a/lib/Plugins/TicketUploader.cpp b/lib/Plugins/TicketUploader.cpp index d0ed324c..e380de09 100644 --- a/lib/Plugins/TicketUploader.cpp +++ b/lib/Plugins/TicketUploader.cpp @@ -381,20 +381,17 @@ void CTicketUploader::SetSettings(const map_plugin_settings_t& pSettings) } } -map_plugin_settings_t CTicketUploader::GetSettings() +const map_plugin_settings_t& CTicketUploader::GetSettings() { - map_plugin_settings_t ret; - - ret["Customer"] = m_sCustomer; - ret["Ticket"] = m_sTicket; - ret["URL"] = m_sURL; - ret["Encrypt"] = m_bEncrypt ? "yes" : "no"; - ret["Upload"] = m_bEncrypt ? "yes" : "no"; - - ret["RetryCount"] = to_string(m_nRetryCount); - ret["RetryDelay"] = to_string(m_nRetryDelay); - - return ret; + m_pSettings["Customer"] = m_sCustomer; + m_pSettings["Ticket"] = m_sTicket; + m_pSettings["URL"] = m_sURL; + m_pSettings["Encrypt"] = m_bEncrypt ? "yes" : "no"; + m_pSettings["Upload"] = m_bEncrypt ? "yes" : "no"; + m_pSettings["RetryCount"] = to_string(m_nRetryCount); + m_pSettings["RetryDelay"] = to_string(m_nRetryDelay); + + return m_pSettings; } PLUGIN_INFO(REPORTER, diff --git a/lib/Plugins/TicketUploader.h b/lib/Plugins/TicketUploader.h index 89954815..9ae3478f 100644 --- a/lib/Plugins/TicketUploader.h +++ b/lib/Plugins/TicketUploader.h @@ -45,7 +45,7 @@ class CTicketUploader : public CReporter public: CTicketUploader(); virtual ~CTicketUploader(); - virtual map_plugin_settings_t GetSettings(); + virtual const map_plugin_settings_t& GetSettings(); virtual void SetSettings(const map_plugin_settings_t& pSettings); virtual std::string Report(const map_crash_report_t& pCrashReport, |