summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bridge/bridge.cpp3
-rw-r--r--src/database/row.hpp2
-rw-r--r--src/irc/irc_client.cpp4
3 files changed, 5 insertions, 4 deletions
diff --git a/src/bridge/bridge.cpp b/src/bridge/bridge.cpp
index b6081d5..08d0bab 100644
--- a/src/bridge/bridge.cpp
+++ b/src/bridge/bridge.cpp
@@ -63,7 +63,8 @@ void Bridge::shutdown(const std::string& exit_message)
{
for (auto& pair: this->irc_clients)
{
- pair.second->send_quit_command(exit_message);
+ std::shared_ptr<IrcClient>& irc = pair.second;
+ irc->send_quit_command(exit_message);
}
}
diff --git a/src/database/row.hpp b/src/database/row.hpp
index 1253f93..4004b5d 100644
--- a/src/database/row.hpp
+++ b/src/database/row.hpp
@@ -28,7 +28,7 @@ struct Row
this->clear_col<0>();
}
- std::tuple<T...> columns;
+ std::tuple<T...> columns{};
std::string table_name;
private:
diff --git a/src/irc/irc_client.cpp b/src/irc/irc_client.cpp
index 5a2f09b..b89ab1c 100644
--- a/src/irc/irc_client.cpp
+++ b/src/irc/irc_client.cpp
@@ -480,7 +480,7 @@ void IrcClient::send_quit_command(const std::string& reason)
void IrcClient::send_join_command(const std::string& chan_name, const std::string& password)
{
- if (this->welcomed == false)
+ if (!this->welcomed)
{
const auto it = std::find_if(begin(this->channels_to_join), end(this->channels_to_join),
[&chan_name](const auto& pair) { return std::get<0>(pair) == chan_name; });
@@ -497,7 +497,7 @@ void IrcClient::send_join_command(const std::string& chan_name, const std::strin
bool IrcClient::send_channel_message(const std::string& chan_name, const std::string& body)
{
IrcChannel* channel = this->get_channel(chan_name);
- if (channel->joined == false)
+ if (!channel->joined)
{
log_warning("Cannot send message to channel ", chan_name, ", it is not joined");
return false;