From 42b7f65a06e9307bf18deff2837535730b895d4a Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Thu, 25 Feb 2016 19:23:46 +0100 Subject: [PATCH] Remove unnecessary std::string::c_str() calls --- src/configreader.cpp | 2 +- src/modules/m_check.cpp | 2 +- src/users.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/configreader.cpp b/src/configreader.cpp index cec4be3d3..1ac6b445a 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -703,7 +703,7 @@ void ServerConfig::ApplyModules(User* user) for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) { - if (ServerInstance->Modules->Load(adding->c_str())) + if (ServerInstance->Modules->Load(*adding)) { ServerInstance->SNO->WriteGlobalSno('a', "*** REHASH LOADED MODULE: %s",adding->c_str()); if (user) diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index 22dcf730f..b6665f29b 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -97,7 +97,7 @@ class CommandCheck : public Command CmdResult Handle (const std::vector ¶meters, User *user) { - if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName.c_str()) + if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName) return CMD_SUCCESS; User *targuser; diff --git a/src/users.cpp b/src/users.cpp index f6cdcc769..11f103e9d 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -340,7 +340,7 @@ void User::Oper(OperInfo* info) LocalUser* l = IS_LOCAL(this); std::string vhost = oper->getConfig("vhost"); if (!vhost.empty()) - l->ChangeDisplayedHost(vhost.c_str()); + l->ChangeDisplayedHost(vhost); std::string opClass = oper->getConfig("class"); if (!opClass.empty()) l->SetClass(opClass); -- 2.39.5