From 67dc6a7576c6ef7efafaa683e20f614921ec9874 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sat, 11 Nov 2017 20:27:30 +0100 Subject: [PATCH] Core/Misc: Fix static analysis issues --- src/common/Logging/Log.cpp | 4 ++-- src/server/authserver/Server/AuthSession.cpp | 2 +- src/server/game/Handlers/CharacterHandler.cpp | 2 +- src/server/game/Handlers/ChatHandler.cpp | 2 +- src/server/game/Handlers/PetitionsHandler.cpp | 12 ++++++------ src/server/scripts/Commands/cs_misc.cpp | 8 ++++---- src/server/scripts/World/action_ip_logger.cpp | 10 +++++----- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/common/Logging/Log.cpp b/src/common/Logging/Log.cpp index 451d06d4a5..278dc23a40 100644 --- a/src/common/Logging/Log.cpp +++ b/src/common/Logging/Log.cpp @@ -74,7 +74,7 @@ void Log::CreateAppenderFromConfig(std::string const& appenderName) // Format=type, level, flags, optional1, optional2 // if type = File. optional1 = file and option2 = mode // if type = Console. optional1 = Color - std::string options = sConfigMgr->GetStringDefault(appenderName.c_str(), ""); + std::string options = sConfigMgr->GetStringDefault(appenderName, ""); Tokenizer tokens(options, ','); Tokenizer::const_iterator iter = tokens.begin(); @@ -127,7 +127,7 @@ void Log::CreateLoggerFromConfig(std::string const& appenderName) LogLevel level = LOG_LEVEL_DISABLED; uint8 type = uint8(-1); - std::string options = sConfigMgr->GetStringDefault(appenderName.c_str(), ""); + std::string options = sConfigMgr->GetStringDefault(appenderName, ""); std::string name = appenderName.substr(7); if (options.empty()) diff --git a/src/server/authserver/Server/AuthSession.cpp b/src/server/authserver/Server/AuthSession.cpp index 04fe198508..02400f0d45 100644 --- a/src/server/authserver/Server/AuthSession.cpp +++ b/src/server/authserver/Server/AuthSession.cpp @@ -577,7 +577,7 @@ bool AuthSession::HandleLogonProof() PreparedStatement *stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPD_LOGONPROOF); stmt->setString(0, K.AsHexStr()); - stmt->setString(1, GetRemoteIpAddress().to_string().c_str()); + stmt->setString(1, GetRemoteIpAddress().to_string()); stmt->setUInt32(2, GetLocaleByName(_localizationName)); stmt->setString(3, _os); stmt->setString(4, _accountInfo.Login); diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 3407918c44..ef5d2e70a7 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -2243,7 +2243,7 @@ void WorldSession::HandleCharFactionOrRaceChangeCallback(std::shared_ptrsetString(0, ss.str().c_str()); + stmt->setString(0, ss.str()); stmt->setUInt32(1, lowGuid); trans->Append(stmt); diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index 59e7382d06..cc29ae6de5 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -502,7 +502,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) if (Channel* chn = ChannelMgr::GetChannelForPlayerByNamePart(channel, sender)) { sScriptMgr->OnPlayerChat(sender, type, lang, msg, chn); - chn->Say(sender->GetGUID(), msg.c_str(), lang); + chn->Say(sender->GetGUID(), msg, lang); } break; } diff --git a/src/server/game/Handlers/PetitionsHandler.cpp b/src/server/game/Handlers/PetitionsHandler.cpp index 3b34132815..4d75ecc0e9 100644 --- a/src/server/game/Handlers/PetitionsHandler.cpp +++ b/src/server/game/Handlers/PetitionsHandler.cpp @@ -489,7 +489,7 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket& recvData) { if (_player->getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", _player->GetName().c_str(), ERR_ARENA_TEAM_TARGET_TOO_LOW_S); + SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", _player->GetName(), ERR_ARENA_TEAM_TARGET_TOO_LOW_S); return; } @@ -499,13 +499,13 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket& recvData) if (_player->GetArenaTeamId(slot)) { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", _player->GetName().c_str(), ERR_ALREADY_IN_ARENA_TEAM_S); + SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", _player->GetName(), ERR_ALREADY_IN_ARENA_TEAM_S); return; } if (_player->GetArenaTeamIdInvited()) { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", _player->GetName().c_str(), ERR_ALREADY_INVITED_TO_ARENA_TEAM_S); + SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", _player->GetName(), ERR_ALREADY_INVITED_TO_ARENA_TEAM_S); return; } } @@ -649,7 +649,7 @@ void WorldSession::HandleOfferPetitionOpcode(WorldPacket& recvData) if (player->getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) { // player is too low level to join an arena team - SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, player->GetName().c_str(), "", ERR_ARENA_TEAM_TARGET_TOO_LOW_S); + SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, player->GetName(), "", ERR_ARENA_TEAM_TARGET_TOO_LOW_S); return; } @@ -660,13 +660,13 @@ void WorldSession::HandleOfferPetitionOpcode(WorldPacket& recvData) if (player->GetArenaTeamId(slot)) { // player is already in an arena team - SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, player->GetName().c_str(), "", ERR_ALREADY_IN_ARENA_TEAM_S); + SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, player->GetName(), "", ERR_ALREADY_IN_ARENA_TEAM_S); return; } if (player->GetArenaTeamIdInvited()) { - SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", _player->GetName().c_str(), ERR_ALREADY_INVITED_TO_ARENA_TEAM_S); + SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", _player->GetName(), ERR_ALREADY_INVITED_TO_ARENA_TEAM_S); return; } } diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 726e65b6ae..a1e7277aee 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -1977,15 +1977,15 @@ public: stmt->setInt64(0, muteTime); } - stmt->setString(1, muteReasonStr.c_str()); - stmt->setString(2, muteBy.c_str()); + stmt->setString(1, muteReasonStr); + stmt->setString(2, muteBy); stmt->setUInt32(3, accountId); LoginDatabase.Execute(stmt); stmt = LoginDatabase.GetPreparedStatement(LOGIN_INS_ACCOUNT_MUTE); stmt->setUInt32(0, accountId); stmt->setUInt32(1, notSpeakTime); - stmt->setString(2, muteBy.c_str()); - stmt->setString(3, muteReasonStr.c_str()); + stmt->setString(2, muteBy); + stmt->setString(3, muteReasonStr); LoginDatabase.Execute(stmt); std::string nameLink = handler->playerLink(targetName); diff --git a/src/server/scripts/World/action_ip_logger.cpp b/src/server/scripts/World/action_ip_logger.cpp index 3c515b38df..03ff4cae77 100644 --- a/src/server/scripts/World/action_ip_logger.cpp +++ b/src/server/scripts/World/action_ip_logger.cpp @@ -144,7 +144,7 @@ class AccountActionIpLogger : public AccountScript stmt->setUInt32(1, characterGuid); stmt->setUInt8(2, aType); stmt->setUInt32(3, playerGuid); - stmt->setString(4, systemNote.c_str()); + stmt->setString(4, systemNote); LoginDatabase.Execute(stmt); } else // ... but for failed login, we query last_attempt_ip from account table. Which we do with an unique query @@ -155,7 +155,7 @@ class AccountActionIpLogger : public AccountScript stmt->setUInt32(1, characterGuid); stmt->setUInt8(2, aType); stmt->setUInt32(3, playerGuid); - stmt->setString(4, systemNote.c_str()); + stmt->setString(4, systemNote); LoginDatabase.Execute(stmt); } return; @@ -236,8 +236,8 @@ class CharacterActionIpLogger : public PlayerScript stmt->setUInt32(0, playerGuid); stmt->setUInt32(1, characterGuid); stmt->setUInt8(2, aType); - stmt->setString(3, currentIp.c_str()); // We query the ip here. - stmt->setString(4, systemNote.c_str()); + stmt->setString(3, currentIp); // We query the ip here. + stmt->setString(4, systemNote); // Seeing as the time differences should be minimal, we do not get unixtime and the timestamp right now; // Rather, we let it be added with the SQL query. @@ -297,7 +297,7 @@ public: stmt2->setUInt32(1, characterGuid); stmt2->setUInt8(2, aType); stmt2->setUInt32(3, playerGuid); - stmt2->setString(4, systemNote.c_str()); + stmt2->setString(4, systemNote); // Seeing as the time differences should be minimal, we do not get unixtime and the timestamp right now; // Rather, we let it be added with the SQL query.