summaryrefslogtreecommitdiff
path: root/src/xmpp
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2014-12-17 13:37:57 +0100
committerFlorent Le Coz <louiz@louiz.org>2014-12-17 13:37:57 +0100
commit720e31a5113c25e48d7754bb812ab84c6c31d1d9 (patch)
tree5a697d40c8df6c71d37168e401a058b94f0b20cf /src/xmpp
parent0ab5ecea133cef5a009bc34ba42c4eaacde6a7dd (diff)
downloadbiboumi-720e31a5113c25e48d7754bb812ab84c6c31d1d9.tar.gz
biboumi-720e31a5113c25e48d7754bb812ab84c6c31d1d9.tar.bz2
biboumi-720e31a5113c25e48d7754bb812ab84c6c31d1d9.tar.xz
biboumi-720e31a5113c25e48d7754bb812ab84c6c31d1d9.zip
Fix a few issues reported by static analyzers
Diffstat (limited to 'src/xmpp')
-rw-r--r--src/xmpp/adhoc_commands_handler.cpp4
-rw-r--r--src/xmpp/adhoc_commands_handler.hpp2
-rw-r--r--src/xmpp/xmpp_component.cpp1
-rw-r--r--src/xmpp/xmpp_stanza.hpp2
4 files changed, 4 insertions, 5 deletions
diff --git a/src/xmpp/adhoc_commands_handler.cpp b/src/xmpp/adhoc_commands_handler.cpp
index 7e1738a..a0defdd 100644
--- a/src/xmpp/adhoc_commands_handler.cpp
+++ b/src/xmpp/adhoc_commands_handler.cpp
@@ -29,7 +29,7 @@ const std::map<const std::string, const AdhocCommand>& AdhocCommandsHandler::get
return this->commands;
}
-XmlNode&& AdhocCommandsHandler::handle_request(const std::string& executor_jid, XmlNode command_node)
+XmlNode AdhocCommandsHandler::handle_request(const std::string& executor_jid, XmlNode command_node)
{
std::string action = command_node.get_tag("action");
if (action.empty())
@@ -127,7 +127,7 @@ XmlNode&& AdhocCommandsHandler::handle_request(const std::string& executor_jid,
command_node.add_child(std::move(error));
}
}
- return std::move(command_node);
+ return command_node;
}
void AdhocCommandsHandler::remove_session(const std::string& session_id, const std::string& initiator_jid)
diff --git a/src/xmpp/adhoc_commands_handler.hpp b/src/xmpp/adhoc_commands_handler.hpp
index 87d4d3d..7ddad47 100644
--- a/src/xmpp/adhoc_commands_handler.hpp
+++ b/src/xmpp/adhoc_commands_handler.hpp
@@ -36,7 +36,7 @@ public:
* Takes a copy of the <command/> node so we can actually edit it and use
* it as our return value.
*/
- XmlNode&& handle_request(const std::string& executor_jid, XmlNode command_node);
+ XmlNode handle_request(const std::string& executor_jid, XmlNode command_node);
/**
* Remove the session from the list. This is done to avoid filling the
* memory with waiting session (for example due to a client that starts
diff --git a/src/xmpp/xmpp_component.cpp b/src/xmpp/xmpp_component.cpp
index 5a5aed4..a1585d7 100644
--- a/src/xmpp/xmpp_component.cpp
+++ b/src/xmpp/xmpp_component.cpp
@@ -286,7 +286,6 @@ void XmppComponent::handle_handshake(const Stanza& stanza)
uint64_t usec;
if (sd_watchdog_enabled(0, &usec) > 0)
{
- std::chrono::microseconds delay(usec);
TimedEventsManager::instance().add_event(TimedEvent(
std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::microseconds(usec / 2)),
[]() { sd_notify(0, "WATCHDOG=1"); }));
diff --git a/src/xmpp/xmpp_stanza.hpp b/src/xmpp/xmpp_stanza.hpp
index a34ef50..9229ae6 100644
--- a/src/xmpp/xmpp_stanza.hpp
+++ b/src/xmpp/xmpp_stanza.hpp
@@ -151,7 +151,7 @@ private:
/**
* An XMPP stanza is just an XML node of level 2 in the XMPP document (the
- * level 1 ones are the <stream::stream/>, and the ones about 2 are just the
+ * level 1 ones are the <stream::stream/>, and the ones above 2 are just the
* content of the stanzas)
*/
typedef XmlNode Stanza;