summaryrefslogtreecommitdiffstats
path: root/src/Daemon
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-12-07 11:46:13 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2009-12-07 11:46:13 +0100
commitfb72ac689ca4832fca215edc942ae01592ecfff8 (patch)
tree9fae338f6e6fd841747b70d06faecb87f40e5ee7 /src/Daemon
parent4e953eeeacab697ba26dc5588478cb12e64350b0 (diff)
downloadabrt-fb72ac689ca4832fca215edc942ae01592ecfff8.tar.gz
abrt-fb72ac689ca4832fca215edc942ae01592ecfff8.tar.xz
abrt-fb72ac689ca4832fca215edc942ae01592ecfff8.zip
*: remove most of remaining const string& params
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'src/Daemon')
-rw-r--r--src/Daemon/CommLayerServer.h4
-rw-r--r--src/Daemon/CommLayerServerDBus.cpp10
-rw-r--r--src/Daemon/CommLayerServerDBus.h4
-rw-r--r--src/Daemon/CommLayerServerSocket.h8
-rw-r--r--src/Daemon/CrashWatcher.cpp2
-rw-r--r--src/Daemon/Makefile.am3
-rw-r--r--src/Daemon/MiddleWare.cpp6
7 files changed, 19 insertions, 18 deletions
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());
}
/**