Commit 3339ce2c authored by louiz’'s avatar louiz’

Trivial little naming changes

parent b7b54d8f
......@@ -398,7 +398,7 @@ void IrcClient::parse_in_buffer(const size_t)
}
}
void IrcClient::actual_send(std::pair<IrcMessage, MessageCallback> message_pair)
void IrcClient::actual_send(std::pair<IrcMessage, MessageCallback>&& message_pair)
{
const IrcMessage& message = message_pair.first;
const MessageCallback& callback = message_pair.second;
......
......@@ -92,7 +92,7 @@ public:
*/
void send_message(IrcMessage message, MessageCallback callback={}, bool throttle=true);
void send_raw(const std::string& txt);
void actual_send(std::pair<IrcMessage, MessageCallback> message_pair);
void actual_send(std::pair<IrcMessage, MessageCallback>&& message_pair);
/**
* Send the PONG irc command
*/
......
......@@ -46,15 +46,14 @@ void TCPClientSocketHandler::init_socket(const struct addrinfo* rp)
else
{
utils::ScopeGuard sg([result](){ freeaddrinfo(result); });
struct addrinfo* rp;
for (rp = result; rp; rp = rp->ai_next)
for (; result; result = result->ai_next)
{
if ((::bind(this->socket,
reinterpret_cast<const struct sockaddr*>(rp->ai_addr),
rp->ai_addrlen)) == 0)
reinterpret_cast<const struct sockaddr*>(result->ai_addr),
result->ai_addrlen)) == 0)
break;
}
if (!rp)
if (!result)
log_error("Failed to bind socket to ", this->bind_addr, ": ",
strerror(errno));
else
......
......@@ -298,8 +298,8 @@ void XmppComponent::send_message(const std::string& from, Xmpp::body&& body, con
{
XmlSubNode private_node(message, "private");
private_node["xmlns"] = "urn:xmpp:carbons:2";
XmlSubNode nocopy(message, "no-copy");
nocopy["xmlns"] = "urn:xmpp:hints";
XmlSubNode nocopy_node(message, "no-copy");
nocopy_node["xmlns"] = "urn:xmpp:hints";
}
if (muc_private)
{
......@@ -590,8 +590,8 @@ void XmppComponent::send_version(const std::string& id, const std::string& jid_t
name.set_inner("biboumi");
}
{
XmlSubNode version(query, "version");
version.set_inner(SOFTWARE_VERSION);
XmlSubNode version_node(query, "version");
version_node.set_inner(SOFTWARE_VERSION);
}
{
XmlSubNode os(query, "os");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment