summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bridge/colors.cpp2
-rw-r--r--src/identd/identd_socket.hpp1
-rw-r--r--src/irc/iid.cpp9
-rw-r--r--src/irc/iid.hpp2
-rw-r--r--src/irc/irc_client.cpp41
-rw-r--r--src/irc/irc_client.hpp6
-rw-r--r--src/main.cpp2
-rw-r--r--src/network/poller.cpp4
-rw-r--r--src/network/tcp_client_socket_handler.cpp2
-rw-r--r--src/network/tcp_server_socket.hpp1
-rw-r--r--src/network/tcp_socket_handler.cpp2
-rw-r--r--src/utils/encoding.cpp2
-rw-r--r--src/utils/timed_events.cpp13
-rw-r--r--src/utils/timed_events.hpp4
-rw-r--r--src/xmpp/adhoc_command.cpp5
-rw-r--r--src/xmpp/adhoc_command.hpp2
-rw-r--r--src/xmpp/biboumi_component.cpp10
-rw-r--r--src/xmpp/jid.cpp2
-rw-r--r--src/xmpp/xmpp_stanza.cpp2
19 files changed, 56 insertions, 56 deletions
diff --git a/src/bridge/colors.cpp b/src/bridge/colors.cpp
index 66f51ee..7662425 100644
--- a/src/bridge/colors.cpp
+++ b/src/bridge/colors.cpp
@@ -4,7 +4,7 @@
#include <algorithm>
#include <iostream>
-#include <string.h>
+#include <cstring>
using namespace std::string_literals;
diff --git a/src/identd/identd_socket.hpp b/src/identd/identd_socket.hpp
index 10cb797..a386d80 100644
--- a/src/identd/identd_socket.hpp
+++ b/src/identd/identd_socket.hpp
@@ -2,7 +2,6 @@
#include <network/socket_handler.hpp>
-#include <cassert>
#include <network/tcp_socket_handler.hpp>
#include <logger/logger.hpp>
diff --git a/src/irc/iid.cpp b/src/irc/iid.cpp
index 6b07793..63c7039 100644
--- a/src/irc/iid.cpp
+++ b/src/irc/iid.cpp
@@ -1,3 +1,4 @@
+#include <utility>
#include <utils/tolower.hpp>
#include <config/config.hpp>
#include <bridge/bridge.hpp>
@@ -7,10 +8,10 @@
constexpr char Iid::separator[];
-Iid::Iid(const std::string& local, const std::string& server, Iid::Type type):
- type(type),
- local(local),
- server(server)
+Iid::Iid(std::string local, std::string server, Iid::Type type):
+ type(std::move(type)),
+ local(std::move(local)),
+ server(std::move(server))
{
}
diff --git a/src/irc/iid.hpp b/src/irc/iid.hpp
index 81cf3ca..89f4797 100644
--- a/src/irc/iid.hpp
+++ b/src/irc/iid.hpp
@@ -59,7 +59,7 @@ public:
Iid(const std::string& iid, const std::set<char>& chantypes);
Iid(const std::string& iid, const std::initializer_list<char>& chantypes);
Iid(const std::string& iid, const Bridge* bridge);
- Iid(const std::string& local, const std::string& server, Type type);
+ Iid(std::string local, std::string server, Type type);
Iid() = default;
Iid(const Iid&) = default;
diff --git a/src/irc/irc_client.cpp b/src/irc/irc_client.cpp
index 48b105d..710ba15 100644
--- a/src/irc/irc_client.cpp
+++ b/src/irc/irc_client.cpp
@@ -1,3 +1,4 @@
+#include <utility>
#include <utils/timed_events.hpp>
#include <database/database.hpp>
#include <irc/irc_message.hpp>
@@ -127,16 +128,16 @@ static const std::unordered_map<std::string,
{"502", {&IrcClient::on_generic_error, {2, 0}}},
};
-IrcClient::IrcClient(std::shared_ptr<Poller>& poller, const std::string& hostname,
- const std::string& nickname, const std::string& username,
- const std::string& realname, const std::string& user_hostname,
+IrcClient::IrcClient(std::shared_ptr<Poller>& poller, std::string hostname,
+ std::string nickname, std::string username,
+ std::string realname, std::string user_hostname,
Bridge& bridge):
TCPClientSocketHandler(poller),
- hostname(hostname),
- user_hostname(user_hostname),
- username(username),
- realname(realname),
- current_nick(nickname),
+ hostname(std::move(hostname)),
+ user_hostname(std::move(user_hostname)),
+ username(std::move(username)),
+ realname(std::move(realname)),
+ current_nick(std::move(nickname)),
bridge(bridge),
welcomed(false),
chanmodes({"", "", "", ""}),
@@ -791,10 +792,10 @@ void IrcClient::on_nickname_conflict(const IrcMessage& message)
{
const std::string nickname = message.arguments[1];
this->on_generic_error(message);
- for (auto it = this->channels.begin(); it != this->channels.end(); ++it)
+ for (const auto& pair: this->channels)
{
Iid iid;
- iid.set_local(it->first);
+ iid.set_local(pair.first);
iid.set_server(this->hostname);
iid.type = Iid::Type::Channel;
this->bridge.send_nickname_conflict_error(iid, nickname);
@@ -808,10 +809,10 @@ void IrcClient::on_nickname_change_too_fast(const IrcMessage& message)
if (message.arguments.size() >= 3)
txt = message.arguments[2];
this->on_generic_error(message);
- for (auto it = this->channels.begin(); it != this->channels.end(); ++it)
+ for (const auto& pair: this->channels)
{
Iid iid;
- iid.set_local(it->first);
+ iid.set_local(pair.first);
iid.set_server(this->hostname);
iid.type = Iid::Type::Channel;
this->bridge.send_presence_error(iid, nickname,
@@ -896,13 +897,13 @@ void IrcClient::on_error(const IrcMessage& message)
{
const std::string leave_message = message.arguments[0];
// The user is out of all the channels
- for (auto it = this->channels.begin(); it != this->channels.end(); ++it)
+ for (const auto& pair: this->channels)
{
Iid iid;
- iid.set_local(it->first);
+ iid.set_local(pair.first);
iid.set_server(this->hostname);
iid.type = Iid::Type::Channel;
- IrcChannel* channel = it->second.get();
+ IrcChannel* channel = pair.second.get();
if (!channel->joined)
continue;
std::string own_nick = channel->get_self()->nick;
@@ -917,10 +918,10 @@ void IrcClient::on_quit(const IrcMessage& message)
std::string txt;
if (message.arguments.size() >= 1)
txt = message.arguments[0];
- for (auto it = this->channels.begin(); it != this->channels.end(); ++it)
+ for (const auto& pair: this->channels)
{
- const std::string chan_name = it->first;
- IrcChannel* channel = it->second.get();
+ const std::string& chan_name = pair.first;
+ IrcChannel* channel = pair.second.get();
const IrcUser* user = channel->find_user(message.prefix);
if (user)
{
@@ -966,9 +967,9 @@ void IrcClient::on_nick(const IrcMessage& message)
{
change_nick_func("", &this->get_dummy_channel());
}
- for (auto it = this->channels.begin(); it != this->channels.end(); ++it)
+ for (const auto& pair: this->channels)
{
- change_nick_func(it->first, it->second.get());
+ change_nick_func(pair.first, pair.second.get());
}
}
diff --git a/src/irc/irc_client.hpp b/src/irc/irc_client.hpp
index 8119201..7593029 100644
--- a/src/irc/irc_client.hpp
+++ b/src/irc/irc_client.hpp
@@ -26,9 +26,9 @@ class Bridge;
class IrcClient: public TCPClientSocketHandler
{
public:
- explicit IrcClient(std::shared_ptr<Poller>& poller, const std::string& hostname,
- const std::string& nickname, const std::string& username,
- const std::string& realname, const std::string& user_hostname,
+ explicit IrcClient(std::shared_ptr<Poller>& poller, std::string hostname,
+ std::string nickname, std::string username,
+ std::string realname, std::string user_hostname,
Bridge& bridge);
~IrcClient();
diff --git a/src/main.cpp b/src/main.cpp
index 76ab5d9..2fa72d5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -11,7 +11,7 @@
#endif
#include <atomic>
-#include <signal.h>
+#include <csignal>
#ifdef USE_DATABASE
# include <litesql.hpp>
#endif
diff --git a/src/network/poller.cpp b/src/network/poller.cpp
index 9f5bcfb..9f62e36 100644
--- a/src/network/poller.cpp
+++ b/src/network/poller.cpp
@@ -2,8 +2,8 @@
#include <logger/logger.hpp>
#include <utils/timed_events.hpp>
-#include <assert.h>
-#include <errno.h>
+#include <cassert>
+#include <cerrno>
#include <stdio.h>
#include <signal.h>
#include <unistd.h>
diff --git a/src/network/tcp_client_socket_handler.cpp b/src/network/tcp_client_socket_handler.cpp
index 4628703..7181c9d 100644
--- a/src/network/tcp_client_socket_handler.cpp
+++ b/src/network/tcp_client_socket_handler.cpp
@@ -256,6 +256,6 @@ std::string TCPClientSocketHandler::get_port() const
bool TCPClientSocketHandler::match_port_pairt(const uint16_t local, const uint16_t remote) const
{
- const uint16_t remote_port = static_cast<uint16_t>(std::stoi(this->port));
+ const auto remote_port = static_cast<uint16_t>(std::stoi(this->port));
return this->is_connected() && local == this->local_port && remote == remote_port;
}
diff --git a/src/network/tcp_server_socket.hpp b/src/network/tcp_server_socket.hpp
index c511962..652b773 100644
--- a/src/network/tcp_server_socket.hpp
+++ b/src/network/tcp_server_socket.hpp
@@ -12,7 +12,6 @@
#include <netinet/ip.h>
#include <cstring>
-#include <cassert>
template <typename RemoteSocketType>
class TcpSocketServer: public SocketHandler
diff --git a/src/network/tcp_socket_handler.cpp b/src/network/tcp_socket_handler.cpp
index 7eebae0..b5e5db1 100644
--- a/src/network/tcp_socket_handler.cpp
+++ b/src/network/tcp_socket_handler.cpp
@@ -8,7 +8,7 @@
#include <sys/types.h>
#include <stdexcept>
#include <unistd.h>
-#include <errno.h>
+#include <cerrno>
#include <cstring>
#ifdef BOTAN_FOUND
diff --git a/src/utils/encoding.cpp b/src/utils/encoding.cpp
index aa91dac..cff0039 100644
--- a/src/utils/encoding.cpp
+++ b/src/utils/encoding.cpp
@@ -4,7 +4,7 @@
#include <stdexcept>
-#include <assert.h>
+#include <cassert>
#include <string.h>
#include <iconv.h>
#include <cerrno>
diff --git a/src/utils/timed_events.cpp b/src/utils/timed_events.cpp
index 5077199..e35a659 100644
--- a/src/utils/timed_events.cpp
+++ b/src/utils/timed_events.cpp
@@ -1,22 +1,23 @@
+#include <utility>
#include <utils/timed_events.hpp>
TimedEvent::TimedEvent(std::chrono::steady_clock::time_point&& time_point,
- std::function<void()> callback, const std::string& name):
+ std::function<void()> callback, std::string name):
time_point(std::move(time_point)),
- callback(callback),
+ callback(std::move(callback)),
repeat(false),
repeat_delay(0),
- name(name)
+ name(std::move(name))
{
}
TimedEvent::TimedEvent(std::chrono::milliseconds&& duration,
- std::function<void()> callback, const std::string& name):
+ std::function<void()> callback, std::string name):
time_point(std::chrono::steady_clock::now() + duration),
- callback(callback),
+ callback(std::move(callback)),
repeat(true),
repeat_delay(std::move(duration)),
- name(name)
+ name(std::move(name))
{
}
diff --git a/src/utils/timed_events.hpp b/src/utils/timed_events.hpp
index 6e28206..393b38d 100644
--- a/src/utils/timed_events.hpp
+++ b/src/utils/timed_events.hpp
@@ -25,9 +25,9 @@ public:
* An event the occurs only once, at the given time_point
*/
explicit TimedEvent(std::chrono::steady_clock::time_point&& time_point,
- std::function<void()> callback, const std::string& name="");
+ std::function<void()> callback, std::string name="");
explicit TimedEvent(std::chrono::milliseconds&& duration,
- std::function<void()> callback, const std::string& name="");
+ std::function<void()> callback, std::string name="");
explicit TimedEvent(TimedEvent&&) = default;
TimedEvent& operator=(TimedEvent&&) = default;
diff --git a/src/xmpp/adhoc_command.cpp b/src/xmpp/adhoc_command.cpp
index 825cc92..e02bf35 100644
--- a/src/xmpp/adhoc_command.cpp
+++ b/src/xmpp/adhoc_command.cpp
@@ -1,11 +1,12 @@
+#include <utility>
#include <xmpp/adhoc_command.hpp>
#include <xmpp/xmpp_component.hpp>
#include <utils/reload.hpp>
using namespace std::string_literals;
-AdhocCommand::AdhocCommand(std::vector<AdhocStep>&& callbacks, const std::string& name, const bool admin_only):
- name(name),
+AdhocCommand::AdhocCommand(std::vector<AdhocStep>&& callbacks, std::string name, const bool admin_only):
+ name(std::move(name)),
callbacks(std::move(callbacks)),
admin_only(admin_only)
{
diff --git a/src/xmpp/adhoc_command.hpp b/src/xmpp/adhoc_command.hpp
index ced4549..c00d9e6 100644
--- a/src/xmpp/adhoc_command.hpp
+++ b/src/xmpp/adhoc_command.hpp
@@ -17,7 +17,7 @@ class AdhocCommand
{
friend class AdhocSession;
public:
- AdhocCommand(std::vector<AdhocStep>&& callbacks, const std::string& name, const bool admin_only);
+ AdhocCommand(std::vector<AdhocStep>&& callbacks, std::string name, const bool admin_only);
~AdhocCommand() = default;
AdhocCommand(const AdhocCommand&) = default;
AdhocCommand(AdhocCommand&&) = default;
diff --git a/src/xmpp/biboumi_component.cpp b/src/xmpp/biboumi_component.cpp
index dc57eeb..b4b6a45 100644
--- a/src/xmpp/biboumi_component.cpp
+++ b/src/xmpp/biboumi_component.cpp
@@ -83,10 +83,8 @@ BiboumiComponent::BiboumiComponent(std::shared_ptr<Poller>& poller, const std::s
void BiboumiComponent::shutdown()
{
- for (auto it = this->bridges.begin(); it != this->bridges.end(); ++it)
- {
- it->second->shutdown("Gateway shutdown");
- }
+ for (auto& pair: this->bridges)
+ pair.second->shutdown("Gateway shutdown");
}
void BiboumiComponent::clean()
@@ -696,8 +694,8 @@ Bridge* BiboumiComponent::find_user_bridge(const std::string& full_jid)
std::vector<Bridge*> BiboumiComponent::get_bridges() const
{
std::vector<Bridge*> res;
- for (auto it = this->bridges.begin(); it != this->bridges.end(); ++it)
- res.push_back(it->second.get());
+ for (const auto& bridge: this->bridges)
+ res.push_back(bridge.second.get());
return res;
}
diff --git a/src/xmpp/jid.cpp b/src/xmpp/jid.cpp
index ba8d70b..19d1b55 100644
--- a/src/xmpp/jid.cpp
+++ b/src/xmpp/jid.cpp
@@ -53,7 +53,7 @@ std::string jidprep(const std::string& original)
char local[max_jid_part_len] = {};
memcpy(local, jid.local.data(), std::min(max_jid_part_len, jid.local.size()));
- Stringprep_rc rc = static_cast<Stringprep_rc>(::stringprep(local, max_jid_part_len,
+ auto rc = static_cast<Stringprep_rc>(::stringprep(local, max_jid_part_len,
static_cast<Stringprep_profile_flags>(0), stringprep_xmpp_nodeprep));
if (rc != STRINGPREP_OK)
{
diff --git a/src/xmpp/xmpp_stanza.cpp b/src/xmpp/xmpp_stanza.cpp
index ac6ce9b..4999851 100644
--- a/src/xmpp/xmpp_stanza.cpp
+++ b/src/xmpp/xmpp_stanza.cpp
@@ -7,7 +7,7 @@
#include <iostream>
#include <sstream>
-#include <string.h>
+#include <cstring>
std::string xml_escape(const std::string& data)
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 19:57:20 +0000