From 982290924a31269c57e10ee800249977d358e93f Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sun, 26 Oct 2014 23:22:06 -0700 Subject: [PATCH] remove unused vars --- .../application/CentralServer/src/shared/CentralServer.cpp | 1 - .../CentralServer/src/shared/LoginServerConnection.cpp | 2 -- .../application/ChatServer/src/shared/ChatInterface.cpp | 1 - .../server/application/ChatServer/src/shared/ChatServer.cpp | 4 ---- .../ChatServer/src/shared/ConnectionServerConnection.cpp | 3 --- .../CommoditiesServer/src/shared/AuctionMarket.cpp | 3 --- .../ConnectionServer/src/shared/ClientConnection.cpp | 2 -- .../LogServer/src/shared/LoggingServerApiObserver.cpp | 2 -- .../application/TaskManager/src/shared/PlanetConnection.cpp | 1 - .../projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.cpp | 3 --- .../application/SwgGameServer/src/shared/core/CSHandler.cpp | 2 -- 11 files changed, 24 deletions(-) diff --git a/engine/server/application/CentralServer/src/shared/CentralServer.cpp b/engine/server/application/CentralServer/src/shared/CentralServer.cpp index 23ee7a56..35d9e51c 100644 --- a/engine/server/application/CentralServer/src/shared/CentralServer.cpp +++ b/engine/server/application/CentralServer/src/shared/CentralServer.cpp @@ -2764,7 +2764,6 @@ void CentralServer::run(void) if (curTime > nextLoadingLogTime) { nextLoadingLogTime = curTime + 10000; - std::string planets; for (std::set::const_iterator i=getInstance().m_planetsWaitingForPreload.begin(); i!=getInstance().m_planetsWaitingForPreload.end(); ++i) LOG("Preload",("Waiting for planet %s",i->c_str())); } diff --git a/engine/server/application/CentralServer/src/shared/LoginServerConnection.cpp b/engine/server/application/CentralServer/src/shared/LoginServerConnection.cpp index ddd35256..bd0821b9 100644 --- a/engine/server/application/CentralServer/src/shared/LoginServerConnection.cpp +++ b/engine/server/application/CentralServer/src/shared/LoginServerConnection.cpp @@ -272,8 +272,6 @@ void LoginServerConnection::onReceive(const Archive::ByteStream & message) unsigned pos = req.getCommandString().find( " " ); pos = pos == std::string::npos ? req.getCommandString().length() : pos; - std::string command = req.getCommandString().substr( 0, pos ); - CentralCSHandler::getInstance().handle( req, getProcessId() ); diff --git a/engine/server/application/ChatServer/src/shared/ChatInterface.cpp b/engine/server/application/ChatServer/src/shared/ChatInterface.cpp index 9f71e8c3..326639d0 100644 --- a/engine/server/application/ChatServer/src/shared/ChatInterface.cpp +++ b/engine/server/application/ChatServer/src/shared/ChatInterface.cpp @@ -771,7 +771,6 @@ void ChatInterface::ConnectPlayer(unsigned int suid, const std::string & charact return; } - std::string canonicalName = makeCanonicalName(characterName); static const std::string game("SOE+SWG"); IGNORE_RETURN(pendingAvatars.insert(std::make_pair(characterName, networkId))); diff --git a/engine/server/application/ChatServer/src/shared/ChatServer.cpp b/engine/server/application/ChatServer/src/shared/ChatServer.cpp index 9d4ee5c8..12bd3d2d 100644 --- a/engine/server/application/ChatServer/src/shared/ChatServer.cpp +++ b/engine/server/application/ChatServer/src/shared/ChatServer.cpp @@ -304,7 +304,6 @@ m_voiceChatIdMap() const std::string getGameCode = ConfigChatServer::getGameCode(); const std::string getGatewayServerIP = ConfigChatServer::getGatewayServerIP(); - const std::string getBackupGatewayServerIP = ConfigChatServer::getBackupGatewayServerIP(); chatInterface = new ChatInterface(getGameCode, getGatewayServerIP, ConfigChatServer::getGatewayServerPort(), ConfigChatServer::getRegistrarHost(), static_cast(ConfigChatServer::getRegistrarPort())); @@ -1179,9 +1178,6 @@ void ChatServer::createRoom(const NetworkId & id, const unsigned int sequence, c Unicode::String wideRoomAddress; splitRoomName(tmpRoomName, wideRoomName, wideRoomAddress); - std::string narrowRoomName = Unicode::wideToNarrow(wideRoomName); - std::string narrowRoomAddress = Unicode::wideToNarrow(wideRoomAddress); - Unicode::String wideTitle = Unicode::narrowToWide(title); roomParams.setRoomName(ChatUnicodeString(wideRoomName.data(), wideRoomName.size())); diff --git a/engine/server/application/ChatServer/src/shared/ConnectionServerConnection.cpp b/engine/server/application/ChatServer/src/shared/ConnectionServerConnection.cpp index 2ce8ddbd..13ce1c55 100644 --- a/engine/server/application/ChatServer/src/shared/ConnectionServerConnection.cpp +++ b/engine/server/application/ChatServer/src/shared/ConnectionServerConnection.cpp @@ -141,7 +141,6 @@ void ConnectionServerConnection::onReceive(const Archive::ByteStream & message) //printf("!Sending via the shortcut\n"); cri = c.getByteStream().begin(); - static const std::string gameType("SWG"); if(cm.isType("ChatInstantMessageToCharacter")) { // deliver IM to character @@ -173,8 +172,6 @@ void ConnectionServerConnection::onReceive(const Archive::ByteStream & message) { cri = c.getByteStream().begin(); - static const std::string gameType("SWG"); - if(cm.isType("ChatDeleteAllPersistentMessages")) { PROFILER_AUTO_BLOCK_DEFINE("ConnectionServer - ChatDeleteAllPersistentMessages"); diff --git a/engine/server/application/CommoditiesServer/src/shared/AuctionMarket.cpp b/engine/server/application/CommoditiesServer/src/shared/AuctionMarket.cpp index 11208577..91324605 100644 --- a/engine/server/application/CommoditiesServer/src/shared/AuctionMarket.cpp +++ b/engine/server/application/CommoditiesServer/src/shared/AuctionMarket.cpp @@ -671,8 +671,6 @@ AuctionMarket::~AuctionMarket() AuctionLocation *AuctionMarket::CreateLocation(const NetworkId & ownerId, const std::string & locationString, int entranceCharge) { - std::string locationId; - NetworkId loc_id = GetLocationId(locationString); AuctionLocation *auctionLocation = new AuctionLocation(loc_id, locationString, ownerId, 0, zeroNetworkId, 0, m_gameTime, 0, ACTIVE, true, entranceCharge); @@ -1802,7 +1800,6 @@ void AuctionMarket::AddBid(const AddBidMessage &message) const AuctionBid *previousBid = auction->GetPreviousBid(); NetworkId previousBidder = zeroNetworkId; int previousBidAmount = 0; - std::string previousBidderName; int maxProxyBid = message.GetMaxProxyBid(); int salesTaxAmount = 0; NetworkId bankId = zeroNetworkId; diff --git a/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp b/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp index 3ed0d56b..f7b3020b 100644 --- a/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp +++ b/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp @@ -539,8 +539,6 @@ void ClientConnection::onConnectionOverflowing (const unsigned int bytesPending { char errbuf[1024]; snprintf(errbuf, sizeof(errbuf), "Connection overflow from server to client, %d bytes. Disconnected.", bytesPending); - std::string name("Connection overflow server->client"); - std::string desc(errbuf); LOG("Network", ("Disconnect: Client connection overflowing. %d bytes pending", bytesPending)); std::vector >::const_iterator i; diff --git a/engine/server/application/LogServer/src/shared/LoggingServerApiObserver.cpp b/engine/server/application/LogServer/src/shared/LoggingServerApiObserver.cpp index 47869179..209b2b0d 100644 --- a/engine/server/application/LogServer/src/shared/LoggingServerApiObserver.cpp +++ b/engine/server/application/LogServer/src/shared/LoggingServerApiObserver.cpp @@ -70,8 +70,6 @@ void LoggingServerApiObserver::log(const LogMessage & msg) } msgText = splittext.substr(splittext.find(":") + 1); - - std::string u = Unicode::wideToNarrow(msg.getUnicodeAttach()); // If there is ANY Unicode, send the whole log as Unicode. If there is ONLY non-Unicode, then send the log non-Unicode. diff --git a/engine/server/application/TaskManager/src/shared/PlanetConnection.cpp b/engine/server/application/TaskManager/src/shared/PlanetConnection.cpp index 216d7e0c..bf2d21af 100644 --- a/engine/server/application/TaskManager/src/shared/PlanetConnection.cpp +++ b/engine/server/application/TaskManager/src/shared/PlanetConnection.cpp @@ -50,7 +50,6 @@ PlanetConnection & PlanetConnection::operator = (const PlanetConnection & rhs) void PlanetConnection::receive(const Archive::ByteStream & message) { - static const std::string localName = NetworkHandler::getHostName(); Archive::ReadIterator r(message); GameNetworkMessage m(r); diff --git a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.cpp b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.cpp index 3ba14e6b..729fda02 100644 --- a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.cpp +++ b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.cpp @@ -1078,8 +1078,6 @@ void CSAssistGameAPIcore::OnConnectLB(unsigned track, unsigned result, std::stri } if (result == CSASSIST_RESULT_TIMEOUT) { - //fprintf(stderr, "OnConnectLB: result=timeout\n"); - std::string connectString = wideToNarrow(m_identityGame) + ":" + wideToNarrow(m_identityServer); GetLBHost(); if (connectRequest && connectResponse) SubmitRequest(connectRequest, connectResponse); @@ -1091,7 +1089,6 @@ void CSAssistGameAPIcore::OnConnectLB(unsigned track, unsigned result, std::stri if (connectRequest && connectResponse) SubmitRequest(connectRequest, connectResponse); } - //fprintf(stderr, "debug: OnConnectLB(): Now m_connectState=%u\n", m_connectState); } //------------------------------------------------------------- diff --git a/game/server/application/SwgGameServer/src/shared/core/CSHandler.cpp b/game/server/application/SwgGameServer/src/shared/core/CSHandler.cpp index 10376750..f4e4eb7b 100644 --- a/game/server/application/SwgGameServer/src/shared/core/CSHandler.cpp +++ b/game/server/application/SwgGameServer/src/shared/core/CSHandler.cpp @@ -488,7 +488,6 @@ namespace CSHandlerNamespace if(!container) return; char stringbuffer[CSHandlerNamespace::largeBufferSize]; - std::vector objList; for (ContainerConstIterator iter(container->begin()); iter != container->end(); ++iter) { @@ -827,7 +826,6 @@ CS_CMD( get_player_items ) { int item_num = 0; - std::vector objList; for (ContainerConstIterator iter(inventoryContainer->begin()); iter != inventoryContainer->end(); ++iter) {