4 files changed, 6 insertions(+), 11 deletions(-)

M louloulibs/utils/encoding.cpp
M louloulibs/xmpp/xmpp_component.cpp
M src/irc/irc_client.cpp
M src/main.cpp

@@ 196,12 196,8 @@ namespace utils
                 outbuf_ptr++;
                 done = true;
                 break;
-              case E2BIG:
-                // This should never happen
-                done = true;
-                break;
-              default:
-                // This should happen even neverer
+              case E2BIG:  // This should never happen
+              default:     // This should happen even neverer
                 done = true;
                 break;
               }

@@ 222,9 222,8 @@ void XmppComponent::close_document()
   this->doc_open = false;
 }
 
-void XmppComponent::handle_handshake(const Stanza& stanza)
+void XmppComponent::handle_handshake(const Stanza&)
 {
-  (void)stanza;
   this->authenticated = true;
   this->ever_auth = true;
   log_info("Authenticated with the XMPP server");

@@ 942,7 942,7 @@ void IrcClient::on_nick(const IrcMessage& message)
 {
   const std::string new_nick = IrcUser(message.arguments[0]).nick;
   const std::string current_nick = IrcUser(message.prefix).nick;
-  const auto change_nick_func = [&](const std::string& chan_name, const IrcChannel* channel)
+  const auto change_nick_func = [this, &new_nick, &current_nick](const std::string& chan_name, const IrcChannel* channel)
   {
     IrcUser* user;
     if (channel->get_self() && channel->get_self()->nick == current_nick)

@@ 14,9 14,9 @@
 #include <signal.h>
 
 // A flag set by the SIGINT signal handler.
-static volatile std::atomic<bool> stop(false);
+static std::atomic<bool> stop(false);
 // Flag set by the SIGUSR1/2 signal handler.
-static volatile std::atomic<bool> reload(false);
+static std::atomic<bool> reload(false);
 // A flag indicating that we are wanting to exit the process. i.e: if this
 // flag is set and all connections are closed, we can exit properly.
 static bool exiting = false;