From dbfcc74e23067a1cc2ceb3bccfff9e8868947419 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 9 Jan 2022 14:38:01 +0000 Subject: Always catch exceptions as a constant reference. --- src/coremods/core_dns.cpp | 2 +- src/coremods/core_hostname_lookup.cpp | 2 +- src/modules/extra/m_ssl_gnutls.cpp | 2 +- src/modules/extra/m_ssl_mbedtls.cpp | 2 +- src/modules/extra/m_ssl_openssl.cpp | 2 +- src/modules/m_clearchan.cpp | 2 +- src/modules/m_customprefix.cpp | 2 +- src/modules/m_dnsbl.cpp | 2 +- src/modules/m_filter.cpp | 4 ++-- src/modules/m_ident.cpp | 2 +- src/modules/m_ldapauth.cpp | 8 ++++---- src/modules/m_ldapoper.cpp | 6 +++--- src/modules/m_rline.cpp | 2 +- src/modules/m_spanningtree/addline.cpp | 2 +- src/modules/m_spanningtree/main.cpp | 4 ++-- src/modules/m_spanningtree/resolvers.cpp | 2 +- src/modules/m_spanningtree/utils.cpp | 2 +- 17 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/coremods/core_dns.cpp b/src/coremods/core_dns.cpp index 49560e57d..3cac400b5 100644 --- a/src/coremods/core_dns.cpp +++ b/src/coremods/core_dns.cpp @@ -663,7 +663,7 @@ class MyManager final recv_packet.Fill(buffer, length); valid = true; } - catch (Exception& ex) + catch (const Exception& ex) { ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, ex.GetReason()); } diff --git a/src/coremods/core_hostname_lookup.cpp b/src/coremods/core_hostname_lookup.cpp index 91b289e16..73dce2d7d 100644 --- a/src/coremods/core_hostname_lookup.cpp +++ b/src/coremods/core_hostname_lookup.cpp @@ -228,7 +228,7 @@ class ModuleHostnameLookup final this->dnsLookup.Set(user); this->DNS->Process(res_reverse); } - catch (DNS::Exception& e) + catch (const DNS::Exception& e) { this->dnsLookup.Unset(user); delete res_reverse; diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 1db07d94a..95927ee20 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -1179,7 +1179,7 @@ class ModuleSSLGnuTLS final ReadProfiles(); ServerInstance->SNO.WriteToSnoMask('r', "GnuTLS TLS profiles have been reloaded."); } - catch (ModuleException& ex) + catch (const ModuleException& ex) { ServerInstance->SNO.WriteToSnoMask('r', "Failed to reload the GnuTLS TLS profiles. " + ex.GetReason()); } diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp index f58f519db..385829750 100644 --- a/src/modules/extra/m_ssl_mbedtls.cpp +++ b/src/modules/extra/m_ssl_mbedtls.cpp @@ -957,7 +957,7 @@ class ModuleSSLmbedTLS final ReadProfiles(); ServerInstance->SNO.WriteToSnoMask('r', "mbedTLS TLS profiles have been reloaded."); } - catch (ModuleException& ex) + catch (const ModuleException& ex) { ServerInstance->SNO.WriteToSnoMask('r', "Failed to reload the mbedTLS TLS profiles. " + ex.GetReason()); } diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index d4db4d180..953e3dc51 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -1013,7 +1013,7 @@ class ModuleSSLOpenSSL final ReadProfiles(); ServerInstance->SNO.WriteToSnoMask('r', "OpenSSL TLS profiles have been reloaded."); } - catch (ModuleException& ex) + catch (const ModuleException& ex) { ServerInstance->SNO.WriteToSnoMask('r', "Failed to reload the OpenSSL TLS profiles. " + ex.GetReason()); } diff --git a/src/modules/m_clearchan.cpp b/src/modules/m_clearchan.cpp index 6a48bbdab..a840037fd 100644 --- a/src/modules/m_clearchan.cpp +++ b/src/modules/m_clearchan.cpp @@ -122,7 +122,7 @@ class CommandClearChan final mask = (method[0] == 'Z') ? curr->GetIPString() : (curr->GetBanIdent() + "@" + curr->GetRealHost()); xline = xlf->Generate(ServerInstance->Time(), 60*60, user->nick, reason, mask); } - catch (ModuleException&) + catch (const ModuleException&) { // Nothing, move on to the next user continue; diff --git a/src/modules/m_customprefix.cpp b/src/modules/m_customprefix.cpp index b077ef7e9..0db6c00c3 100644 --- a/src/modules/m_customprefix.cpp +++ b/src/modules/m_customprefix.cpp @@ -101,7 +101,7 @@ class ModuleCustomPrefix final modes.push_back(mh); ServerInstance->Modules.AddService(*mh); } - catch (ModuleException& e) + catch (const ModuleException& e) { throw ModuleException(this, e.GetReason() + " (while creating mode from " + tag->source.str() + ")"); } diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index db9c2ed01..c0b8cde86 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -447,7 +447,7 @@ class ModuleDNSBL final { this->DNS->Process(r); } - catch (DNS::Exception &ex) + catch (const DNS::Exception& ex) { delete r; ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, ex.GetReason()); diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index 09fe913f9..dcb7063bf 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -747,7 +747,7 @@ void ModuleFilter::OnDecodeMetaData(Extensible* target, const std::string &extna FilterResult data = DecodeFilter(extdata); this->AddFilter(data.freeform, data.action, data.reason, data.duration, data.GetFlags()); } - catch (ModuleException& e) + catch (const ModuleException& e) { ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "Error when unserializing filter: " + e.GetReason()); } @@ -807,7 +807,7 @@ std::pair ModuleFilter::AddFilter(const std::string& freeform filters.emplace_back(RegexEngine, freeform, reason, type, duration, flgs, config); dirty = true; } - catch (ModuleException &e) + catch (const ModuleException& e) { ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "Error in regular expression '%s': %s", freeform.c_str(), e.GetReason().c_str()); return std::make_pair(false, e.GetReason()); diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp index caaa8f116..5f87c52c6 100644 --- a/src/modules/m_ident.cpp +++ b/src/modules/m_ident.cpp @@ -347,7 +347,7 @@ class ModuleIdent final isock = new IdentRequestSocket(this, user); socket.Set(user, isock); } - catch (ModuleException &e) + catch (const ModuleException& e) { ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "Ident exception: " + e.GetReason()); } diff --git a/src/modules/m_ldapauth.cpp b/src/modules/m_ldapauth.cpp index 05d1d822e..96704e2e3 100644 --- a/src/modules/m_ldapauth.cpp +++ b/src/modules/m_ldapauth.cpp @@ -167,7 +167,7 @@ class BindInterface final LDAP->Compare(this, DN, attr, val); ++attrCount; } - catch (LDAPException &ex) + catch (const LDAPException& ex) { if (verbose) ServerInstance->SNO.WriteToSnoMask('c', "Unable to compare attributes %s=%s: %s", attr.c_str(), val.c_str(), ex.GetReason().c_str()); @@ -244,7 +244,7 @@ class SearchInterface final LDAP->Bind(new BindInterface(this->creator, provider, uid, bindDn), bindDn, user->password); } - catch (LDAPException& ex) + catch (const LDAPException& ex) { ServerInstance->SNO.WriteToSnoMask('a', "Error searching LDAP server: " + ex.GetReason()); } @@ -284,7 +284,7 @@ class AdminBindInterface final { LDAP->Search(new SearchInterface(this->creator, provider, uuid), base, what); } - catch (LDAPException& ex) + catch (const LDAPException& ex) { ServerInstance->SNO.WriteToSnoMask('a', "Error searching LDAP server: " + ex.GetReason()); } @@ -428,7 +428,7 @@ public: { LDAP->BindAsManager(new AdminBindInterface(this, LDAP.GetProvider(), user->uuid, base, what)); } - catch (LDAPException &ex) + catch (const LDAPException& ex) { ServerInstance->SNO.WriteToSnoMask('a', "LDAP exception: " + ex.GetReason()); ServerInstance->Users.QuitUser(user, killreason); diff --git a/src/modules/m_ldapoper.cpp b/src/modules/m_ldapoper.cpp index 9d1e5a28b..d6fb979a2 100644 --- a/src/modules/m_ldapoper.cpp +++ b/src/modules/m_ldapoper.cpp @@ -119,7 +119,7 @@ class SearchInterface final LDAP->Bind(new BindInterface(this->creator, uid, opername, password), bindDn, password); } - catch (LDAPException& ex) + catch (const LDAPException& ex) { ServerInstance->SNO.WriteToSnoMask('a', "Error searching LDAP server: " + ex.GetReason()); } @@ -173,7 +173,7 @@ class AdminBindInterface final { LDAP->Search(new SearchInterface(this->creator, provider, user, opername, password), base, what); } - catch (LDAPException& ex) + catch (const LDAPException& ex) { ServerInstance->SNO.WriteToSnoMask('a', "Error searching LDAP server: " + ex.GetReason()); } @@ -240,7 +240,7 @@ class ModuleLDAPOper final LDAP->BindAsManager(new AdminBindInterface(this, LDAP.GetProvider(), user->uuid, opername, password, base, what)); return MOD_RES_DENY; } - catch (LDAPException& ex) + catch (const LDAPException& ex) { ServerInstance->SNO.WriteToSnoMask('a', "LDAP exception: " + ex.GetReason()); } diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index bc599147a..52789ae06 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.cpp @@ -155,7 +155,7 @@ class CommandRLine final { r = factory.Generate(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str()); } - catch (ModuleException &e) + catch (const ModuleException& e) { ServerInstance->SNO.WriteToSnoMask('a', "Could not add R-line: " + e.GetReason()); } diff --git a/src/modules/m_spanningtree/addline.cpp b/src/modules/m_spanningtree/addline.cpp index 17f902cee..7b9246312 100644 --- a/src/modules/m_spanningtree/addline.cpp +++ b/src/modules/m_spanningtree/addline.cpp @@ -47,7 +47,7 @@ CmdResult CommandAddLine::Handle(User* usr, Params& params) { xl = xlf->Generate(ServerInstance->Time(), ConvToNum(params[4]), params[2], params[5], params[1]); } - catch (ModuleException &e) + catch (const ModuleException& e) { ServerInstance->SNO.WriteToSnoMask('x', "Unable to ADDLINE type %s from %s: %s", params[0].c_str(), setter.c_str(), e.GetReason().c_str()); return CmdResult::FAILURE; diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 02668d190..70005841f 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -269,7 +269,7 @@ void ModuleSpanningTree::ConnectServer(std::shared_ptr x, std::shared_ptr< { DNS->Process(snr); } - catch (DNS::Exception& e) + catch (const DNS::Exception& e) { delete snr; ServerInstance->SNO.WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason().c_str()); @@ -676,7 +676,7 @@ void ModuleSpanningTree::ReadConfig(ConfigStatus& status) { Utils->ReadConfiguration(); } - catch (ModuleException& e) + catch (const ModuleException& e) { // Refresh the IP cache anyway, so servers read before the error will be allowed to connect Utils->RefreshIPCache(); diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp index 782f0d520..d8ce53d4a 100644 --- a/src/modules/m_spanningtree/resolvers.cpp +++ b/src/modules/m_spanningtree/resolvers.cpp @@ -97,7 +97,7 @@ void ServernameResolver::OnError(const DNS::Query *r) this->manager->Process(snr); return; } - catch (DNS::Exception &) + catch (const DNS::Exception&) { delete snr; } diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp index aad601251..c75d3cf0c 100644 --- a/src/modules/m_spanningtree/utils.cpp +++ b/src/modules/m_spanningtree/utils.cpp @@ -222,7 +222,7 @@ void SpanningTreeUtilities::RefreshIPCache() { this->Creator->DNS->Process(sr); } - catch (DNS::Exception &) + catch (const DNS::Exception&) { delete sr; } -- cgit v1.3.1-10-gc9f91