diff options
-rw-r--r-- | lib/CommLayer/DBusServerProxy.h | 14 | ||||
-rw-r--r-- | lib/Plugins/Bugzilla.cpp | 2 | ||||
-rw-r--r-- | lib/Plugins/FileTransfer.h | 4 | ||||
-rw-r--r-- | src/Daemon/CrashWatcher.cpp | 7 | ||||
-rw-r--r-- | src/Daemon/Daemon.cpp | 6 |
5 files changed, 17 insertions, 16 deletions
diff --git a/lib/CommLayer/DBusServerProxy.h b/lib/CommLayer/DBusServerProxy.h index 78fb28b3..1a84f438 100644 --- a/lib/CommLayer/DBusServerProxy.h +++ b/lib/CommLayer/DBusServerProxy.h @@ -42,13 +42,13 @@ public: /* methods exported by this interface, * you will have to implement them in your ObjectAdaptor */ - virtual vector_crash_infos_t GetCrashInfos(const std::string &pDBusSender) = 0; - virtual map_crash_report_t CreateReport(const std::string &pUUID, const std::string &pDBusSender) = 0; - virtual uint64_t CreateReport_t(const std::string &pUUID, const std::string &pDBusSender) = 0; - virtual bool Report(map_crash_report_t pReport, const std::string &pDBusSender) = 0; - virtual bool DeleteDebugDump(const std::string& pUUID, const std::string& pDBusSender) = 0; - virtual map_crash_report_t GetJobResult(uint64_t pJobID, const std::string& pDBusSender) = 0; - virtual vector_map_string_string_t GetPluginsInfo() = 0; + virtual vector_crash_infos_t GetCrashInfos(const std::string &pDBusSender) = 0; + virtual map_crash_report_t CreateReport(const std::string &pUUID, const std::string &pDBusSender) = 0; + virtual uint64_t CreateReport_t(const std::string &pUUID, const std::string &pDBusSender) = 0; + virtual bool Report(map_crash_report_t pReport, const std::string &pDBusSender) = 0; + virtual bool DeleteDebugDump(const std::string& pUUID, const std::string& pDBusSender) = 0; + virtual map_crash_report_t GetJobResult(uint64_t pJobID, const std::string& pDBusSender) = 0; + virtual vector_map_string_string_t GetPluginsInfo() = 0; public: /* signal emitters for this interface diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp index 2cb5b4cf..227f269c 100644 --- a/lib/Plugins/Bugzilla.cpp +++ b/lib/Plugins/Bugzilla.cpp @@ -259,7 +259,7 @@ void CReporterBugzilla::AddAttachments(const std::string& pBugId, const map_cras it->second[CD_CONTENT].length()); NSSBase64Encoder_Destroy(base64, PR_FALSE); std::string attchmentInBase64Printable = ""; - for(unsigned int ii = 0; ii < m_sAttchmentInBase64.length(); ii++) + for (unsigned int ii = 0; ii < m_sAttchmentInBase64.length(); ii++) { if (isprint(m_sAttchmentInBase64[ii])) { diff --git a/lib/Plugins/FileTransfer.h b/lib/Plugins/FileTransfer.h index 68ba0fb7..3f8be474 100644 --- a/lib/Plugins/FileTransfer.h +++ b/lib/Plugins/FileTransfer.h @@ -44,9 +44,9 @@ class CFileTransfer : public CAction public: CFileTransfer() : + m_sArchiveType(".tar.gz"), m_nRetryCount(3), - m_nRetryDelay(20), - m_sArchiveType(".tar.gz") + m_nRetryDelay(20) {} virtual void LoadSettings(const std::string& pPath); diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp index 1ad59988..cba81f14 100644 --- a/src/Daemon/CrashWatcher.cpp +++ b/src/Daemon/CrashWatcher.cpp @@ -149,7 +149,8 @@ gboolean CCrashWatcher::handle_event_cb(GIOChannel *gio, GIOCondition condition, return TRUE; } -void *CCrashWatcher::create_report(void *arg){ +void *CCrashWatcher::create_report(void *arg) +{ thread_data_t *thread_data = (thread_data_t *) arg; map_crash_info_t crashReport; thread_data->daemon->Debug("Creating report..."); @@ -792,7 +793,7 @@ uint64_t CCrashWatcher::CreateReport_t(const std::string &pUUID,const std::strin thread_data->UID = xstrdup(pUID.c_str()); thread_data->dest = xstrdup(pSender.c_str()); thread_data->daemon = this; - if(pthread_create(&(thread_data->thread_id), NULL, create_report, (void *)thread_data) != 0) + if (pthread_create(&(thread_data->thread_id), NULL, create_report, (void *)thread_data) != 0) { throw CABRTException(EXCEP_FATAL, "CCrashWatcher::CreateReport_t(): Cannot create thread!"); } @@ -876,7 +877,7 @@ vector_map_string_string_t CCrashWatcher::GetPluginsInfo() { return m_pMW->GetPluginsInfo(); } - catch(CABRTException &e) + catch (CABRTException &e) { if (e.type() == EXCEP_FATAL) { diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp index 0b7393aa..b8b350c4 100644 --- a/src/Daemon/Daemon.cpp +++ b/src/Daemon/Daemon.cpp @@ -81,7 +81,7 @@ int main(int argc, char** argv) { usleep(100 * 1000); } - _exit(sig_caught != SIGTERM); /* TERM:ok (0), anything else: bad (1) */ + _exit(sig_caught != SIGTERM); /* TERM:ok(0), else:bad(1) */ } /* Child (daemon) continues */ pid_t sid = setsid(); @@ -104,11 +104,11 @@ int main(int argc, char** argv) } g_pCrashWatcher->Run(); } - catch(CABRTException& e) + catch (CABRTException& e) { std::cerr << "Cannot create daemon: " << e.what() << std::endl; } - catch(std::exception& e) + catch (std::exception& e) { std::cerr << "Cannot create daemon: " << e.what() << std::endl; } |