From 4d2287d07273c90d6d234193ee9e10cbae214ec0 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sun, 26 Oct 2014 23:28:34 -0700 Subject: [PATCH] potentially breaking: unused vars --- .../application/TransferServer/src/shared/TransferServer.cpp | 1 - .../server/library/serverDatabase/src/shared/TaskCSTasks.cpp | 1 - .../library/serverGame/src/shared/ai/AiCombatPulseQueue.cpp | 1 - .../serverGame/src/shared/console/ConsoleCommandParserAi.cpp | 1 - .../server/library/serverGame/src/shared/core/GameServer.cpp | 3 --- .../serverGame/src/shared/core/ServerImageDesignerManager.cpp | 1 - .../library/serverGame/src/shared/object/CreatureObject.cpp | 2 +- .../serverGame/src/shared/object/CreatureObject_Mounts.cpp | 3 +-- .../src/shared/object/HarvesterInstallationObject.cpp | 1 - .../src/shared/object/ManufactureSchematicObject.cpp | 2 -- .../library/serverGame/src/shared/object/PlayerObject.cpp | 1 - .../library/serverGame/src/shared/object/ServerObject.cpp | 1 - .../serverGame/src/shared/space/SpaceDockingManager.cpp | 1 - .../library/serverScript/src/shared/ScriptMethodsCrafting.cpp | 2 -- .../sharedDatabaseInterface/src/shared/queue/DbTaskRequest.cpp | 1 - .../library/sharedDebug/src/shared/RemoteDebug_inner.cpp | 1 - engine/shared/library/sharedFile/src/shared/TreeFile.cpp | 1 - .../library/sharedGame/src/shared/core/HyperspaceManager.cpp | 1 - .../library/sharedGame/src/shared/core/OutOfBandPackager.cpp | 1 - .../library/sharedGame/src/shared/object/MatchMakingId.cpp | 2 -- .../src/shared/clientGameServer/BuffBuilderChangeMessage.cpp | 1 - .../src/shared/clientGameServer/MessageQueueCreateSaga.cpp | 1 - .../sharedTemplateDefinition/src/shared/core/TemplateData.cpp | 2 -- .../sharedTemplateDefinition/src/shared/core/TpfFile.cpp | 1 - .../library/sharedUtility/src/shared/DataTableWriter.cpp | 2 -- .../library/soePlatform/VChatAPI/utils2.0/utils/Api/api.cpp | 1 - .../soePlatform/VChatAPI/utils2.0/utils/Api/apiPinned.cpp | 1 - 27 files changed, 2 insertions(+), 35 deletions(-) diff --git a/engine/server/application/TransferServer/src/shared/TransferServer.cpp b/engine/server/application/TransferServer/src/shared/TransferServer.cpp index adc61cd2..07334ab4 100644 --- a/engine/server/application/TransferServer/src/shared/TransferServer.cpp +++ b/engine/server/application/TransferServer/src/shared/TransferServer.cpp @@ -267,7 +267,6 @@ void TransferServer::requestCharacterList(unsigned int track, unsigned int stati // list. The LoginServer returns the list, with the tracking // ID, to the CentralServer, and ultimately responds to this // transfer server with the listing. - static const std::string emptyString(""); TransferCharacterData characterData(TransferRequestMoveValidation::TRS_transfer_server); characterData.setCustomerLocalizedLanguage(customerLocalizedLanguage); characterData.setSourceGalaxy(serverName); diff --git a/engine/server/library/serverDatabase/src/shared/TaskCSTasks.cpp b/engine/server/library/serverDatabase/src/shared/TaskCSTasks.cpp index 6482ad3b..4be9aad2 100644 --- a/engine/server/library/serverDatabase/src/shared/TaskCSTasks.cpp +++ b/engine/server/library/serverDatabase/src/shared/TaskCSTasks.cpp @@ -344,7 +344,6 @@ bool TaskGetCharacterId::process(DB::Session *session) void TaskGetCharacterId::onComplete() { // REPORT_LOG(true, ("TaskGetCharactersForAccount::onComplete()\n")); - std::string response = ""; NetworkId characterId; uint32 stationId = 0; if(m_characterIds.size() > 1 ) diff --git a/engine/server/library/serverGame/src/shared/ai/AiCombatPulseQueue.cpp b/engine/server/library/serverGame/src/shared/ai/AiCombatPulseQueue.cpp index 41cf4c7e..c3e95004 100644 --- a/engine/server/library/serverGame/src/shared/ai/AiCombatPulseQueue.cpp +++ b/engine/server/library/serverGame/src/shared/ai/AiCombatPulseQueue.cpp @@ -80,7 +80,6 @@ void AiCombatPulseQueue::setAiMaxWaitTimeMs(unsigned int amount) void AiCombatPulseQueue::alter(real time) { int count = 0; - static const std::vector emptyVector; unsigned long timeMs = Clock::getFrameStartTimeMs() + static_cast(time * 1000.0f); s_timeOrderedAi.clear(); diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserAi.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserAi.cpp index bed29504..65298e93 100644 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserAi.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserAi.cpp @@ -166,7 +166,6 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri } AICreatureController * const aiCreatureController = AICreatureController::getAiCreatureController(targetNetworkId); - Unicode::String systemMessage; if (aiCreatureController == NULL) { diff --git a/engine/server/library/serverGame/src/shared/core/GameServer.cpp b/engine/server/library/serverGame/src/shared/core/GameServer.cpp index d7bf0c21..5eb393d2 100644 --- a/engine/server/library/serverGame/src/shared/core/GameServer.cpp +++ b/engine/server/library/serverGame/src/shared/core/GameServer.cpp @@ -3861,9 +3861,6 @@ unsigned long GameServerNamespace::getFrameRateLimit() void GameServer::run(void) { - static const std::string frameLogChannel = "EndFrame:Time"; - static const std::string frameLogCount = "EndFrame:Objects"; - getInstance().initialize(); unsigned long lastFrameTime = 0; diff --git a/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.cpp b/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.cpp index 80adfdea..fe976e69 100644 --- a/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/ServerImageDesignerManager.cpp @@ -541,7 +541,6 @@ void ServerImageDesignerManager::sendSessionToScript(SharedImageDesignerManager: std::vector morphValues; std::vector indexKeys; std::vector indexValues; - std::vector holoEmotes; for(std::map::const_iterator i = session.morphChanges.begin(); i != session.morphChanges.end(); ++i) { morphKeys.push_back(i->first.c_str()); diff --git a/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp b/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp index c5d5ba69..7dbb911b 100644 --- a/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp @@ -9500,7 +9500,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message) const StringId subject("player_structure", "vendor_purge_warning_subject"); const StringId body("player_structure", "vendor_purge_warning_body"); const Unicode::String mail_subject = Unicode::narrowToWide("@" + subject.getCanonicalRepresentation()); - const Unicode::String mail_body = Unicode::narrowToWide("@" + body.getCanonicalRepresentation()); + /*const Unicode::String mail_body = Unicode::narrowToWide("@" + body.getCanonicalRepresentation());*/ ProsePackage pp; pp.stringId = body; diff --git a/engine/server/library/serverGame/src/shared/object/CreatureObject_Mounts.cpp b/engine/server/library/serverGame/src/shared/object/CreatureObject_Mounts.cpp index 993140f7..195b91e4 100644 --- a/engine/server/library/serverGame/src/shared/object/CreatureObject_Mounts.cpp +++ b/engine/server/library/serverGame/src/shared/object/CreatureObject_Mounts.cpp @@ -171,8 +171,7 @@ int CreatureObjectNamespace::getSaddleSeatingCapacity(CreatureObject const * con ServerObject const * const serverObject = mount->asServerObject(); SharedObjectTemplate const * const sharedObjectTemplate = serverObject->getSharedTemplate(); - std::string const appearanceFilename = (sharedObjectTemplate != 0) ? sharedObjectTemplate->getAppearanceFilename() : "None"; - + //std::string const appearanceFilename = (sharedObjectTemplate != 0) ? sharedObjectTemplate->getAppearanceFilename() : "None"; //DEBUG_REPORT_LOG(true, ("sharedObjectTemplate appearanceFilename = '%s'\n", appearanceFilename.c_str())); } diff --git a/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.cpp b/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.cpp index c4c99692..c8c7ad75 100644 --- a/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.cpp @@ -252,7 +252,6 @@ void HarvesterInstallationObject::selectResource (const NetworkId & resourceType if (isAuthoritative()) { bool found=false; - std::vector pools; if (!m_survey) takeSurvey(); diff --git a/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.cpp b/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.cpp index 420b527b..00b51fc1 100644 --- a/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.cpp @@ -1086,7 +1086,6 @@ void ManufactureSchematicObject::addSlotComponent(const StringId & name, std::vector attribBonuses; if (component.getAttribBonuses(attribBonuses)) { - const std::string bonusObjVarName(componentCopyName + "." + OBJVAR_ATTRIBUTE_BONUSES); std::vector componentBonuses(attribBonuses.size()); std::copy(attribBonuses.begin(), attribBonuses.end(), componentBonuses.begin()); setObjVarItem(componentCopyName + "." + OBJVAR_ATTRIBUTE_BONUSES, componentBonuses); @@ -2485,7 +2484,6 @@ bool ManufactureSchematicObject::setObjectComponents(TangibleObject * object, bo // check the objects in the schematic volume container to make sure they match // the ingredients needed - std::vector crateList; Crafting::IngredientSlot slotData; ContainerIterator iter; Crafting::Ingredients::const_iterator ingredientIter; diff --git a/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp b/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp index 76c64d74..8115ff72 100644 --- a/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp @@ -1151,7 +1151,6 @@ bool PlayerObject::requestCraftingSession(const NetworkId & toolId) VolumeContainer const * const inventoryContainer = ContainerInterface::getVolumeContainer(*inventory); if (inventoryContainer) { - std::vector objList; for (ContainerConstIterator iter(inventoryContainer->begin()); iter != inventoryContainer->end(); ++iter) { CachedNetworkId const & objId = (*iter); diff --git a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp index 44e5e292..7a3e9d5a 100644 --- a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp @@ -6339,7 +6339,6 @@ void ServerObject::getAttributes(AttributeVector &) const void ServerObject::getAttributesForAuction(AttributeVector &data) const { static const std::string attributeClientSharedTemplateName("ClientSharedTemplateName"); - static const std::string attributeAppearanceData("AppearanceData"); DEBUG_FATAL(strlen(getClientSharedTemplateName()) > 1000,("Client shared template name was more than 1000 characters long, too long to save.")); diff --git a/engine/server/library/serverGame/src/shared/space/SpaceDockingManager.cpp b/engine/server/library/serverGame/src/shared/space/SpaceDockingManager.cpp index 98444246..c836be74 100644 --- a/engine/server/library/serverGame/src/shared/space/SpaceDockingManager.cpp +++ b/engine/server/library/serverGame/src/shared/space/SpaceDockingManager.cpp @@ -322,7 +322,6 @@ void SpaceDockingManager::fetchDockingProcedure(Object const & dockingUnit, Obje // Find the correct dock pad to set down on - std::string finalDockPadLetter; ShipsBeingDockedList::iterator iterShipsBeingDockedList = s_shipsBeingDockedList.find(CachedNetworkId(dockTarget)); if (iterShipsBeingDockedList == s_shipsBeingDockedList.end()) diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsCrafting.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsCrafting.cpp index 9cdcca52..b5d325eb 100644 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsCrafting.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsCrafting.cpp @@ -1992,8 +1992,6 @@ void JNICALL ScriptMethodsCraftingNamespace::getValidManufactureSchematicsForSta */ jboolean JNICALL ScriptMethodsCraftingNamespace::hasValidManufactureSchematicsForStation(JNIEnv *env, jobject self, jlong player, jlong station) { - static const Unicode::String SEPARATOR(Unicode::narrowToWide("*")); - UNREF(self); if (player == 0 || station == 0) diff --git a/engine/shared/library/sharedDatabaseInterface/src/shared/queue/DbTaskRequest.cpp b/engine/shared/library/sharedDatabaseInterface/src/shared/queue/DbTaskRequest.cpp index 9c324790..d4b6f710 100644 --- a/engine/shared/library/sharedDatabaseInterface/src/shared/queue/DbTaskRequest.cpp +++ b/engine/shared/library/sharedDatabaseInterface/src/shared/queue/DbTaskRequest.cpp @@ -40,7 +40,6 @@ void DB::TaskRequest::workerThreadLoop(DB::Session *ses) { // save off the failed query statement from the process() that failed // because it will be overwritten by the test query statement - std::string failedQuery = ses->getLastQueryStatement(); ses->rollbackTransaction(); Os::sleep(DB::Server::getErrorSleepTime()); diff --git a/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.cpp b/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.cpp index 30685720..39aa3a54 100644 --- a/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.cpp +++ b/engine/shared/library/sharedDebug/src/shared/RemoteDebug_inner.cpp @@ -288,7 +288,6 @@ void RemoteDebugClient::receive(const unsigned char * const message, const uint3 //can't have local variables defined within switch statements, so place them out here. int32 t; VARIABLE_TYPES varType; - std::string variableName; switch(type) { diff --git a/engine/shared/library/sharedFile/src/shared/TreeFile.cpp b/engine/shared/library/sharedFile/src/shared/TreeFile.cpp index 09acf384..0c46332c 100644 --- a/engine/shared/library/sharedFile/src/shared/TreeFile.cpp +++ b/engine/shared/library/sharedFile/src/shared/TreeFile.cpp @@ -875,7 +875,6 @@ bool TreeFile::stripTreeFileSearchPathFromFile(const char *inputPath, char *outp { // make sure the output buffer has enough room int const pathLength = static_cast(strlen(path)); - int const outputLength = static_cast(strlen(buffer)) - pathLength; if (outputLength > outputPathBufferSize) return false; diff --git a/engine/shared/library/sharedGame/src/shared/core/HyperspaceManager.cpp b/engine/shared/library/sharedGame/src/shared/core/HyperspaceManager.cpp index 4ab19f54..07be79fb 100644 --- a/engine/shared/library/sharedGame/src/shared/core/HyperspaceManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/HyperspaceManager.cpp @@ -105,7 +105,6 @@ void HyperspaceManager::install() return; } DataTable const * const hyperspaceLocationsTable = DataTableManager::getTable(cms_hyperspaceLocationsTableName, true); - std::string hyperspacePointName; if(hyperspaceLocationsTable) { HyperspaceLocation hyperspaceLoc; diff --git a/engine/shared/library/sharedGame/src/shared/core/OutOfBandPackager.cpp b/engine/shared/library/sharedGame/src/shared/core/OutOfBandPackager.cpp index f621cd7f..f9b71c77 100644 --- a/engine/shared/library/sharedGame/src/shared/core/OutOfBandPackager.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/OutOfBandPackager.cpp @@ -119,7 +119,6 @@ OutOfBandPackager::OutOfBandBaseVector OutOfBandPackager::unpack(const Unicode:: Archive::ByteStream bs(buf, buflen); Archive::ReadIterator ri(bs); - std::string templateName; unsigned char typeId = 0; int position = 0; int numUnpacked = 0; diff --git a/engine/shared/library/sharedGame/src/shared/object/MatchMakingId.cpp b/engine/shared/library/sharedGame/src/shared/object/MatchMakingId.cpp index 81f0ba62..6a7d6900 100644 --- a/engine/shared/library/sharedGame/src/shared/object/MatchMakingId.cpp +++ b/engine/shared/library/sharedGame/src/shared/object/MatchMakingId.cpp @@ -86,8 +86,6 @@ bool MatchMakingId::isBitSet(Bit const bit) const //----------------------------------------------------------------------------- std::string MatchMakingId::getDebugIntString() const { - IntVector ints(getInts()); - std::string result; for (int bit = 0; bit < getBitCount(); ++bit) diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderChangeMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderChangeMessage.cpp index 5398712b..bb737fde 100644 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderChangeMessage.cpp +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/BuffBuilderChangeMessage.cpp @@ -84,7 +84,6 @@ MessageQueue::Data* BuffBuilderChangeMessage::unpack(Archive::ReadIterator & sou NetworkId tempId; bool tempBool = false; - std::string tempStr; int tempInt = 0; time_t tempTime = 0; diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCreateSaga.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCreateSaga.cpp index 41d4bfcc..3a90cdb7 100644 --- a/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCreateSaga.cpp +++ b/engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueCreateSaga.cpp @@ -75,7 +75,6 @@ MessageQueue::Data* MessageQueueCreateSaga::unpack(Archive::ReadIterator & sourc int numTasks; int taskType, numParameters; - std::string parameter; Archive::get(source, numTasks); msg->setTotalTasks(numTasks); for (int i = 0; i < numTasks; ++i) diff --git a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateData.cpp b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateData.cpp index fe33dbb5..7a9ccd78 100644 --- a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateData.cpp +++ b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TemplateData.cpp @@ -1692,8 +1692,6 @@ std::string upperName; */ void TemplateData::writeCompilerHeaderMethods(File &fp) const { -std::string upperName; - DEBUG_FATAL(!m_writeForCompilerFlag, ("write for compiler not enabled")); fp.print("public:\n"); diff --git a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TpfFile.cpp b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TpfFile.cpp index 95428c81..f258772d 100644 --- a/engine/shared/library/sharedTemplateDefinition/src/shared/core/TpfFile.cpp +++ b/engine/shared/library/sharedTemplateDefinition/src/shared/core/TpfFile.cpp @@ -329,7 +329,6 @@ int TpfFile::WriteIffFile(Iff & iffData, const Filename & fileName) buflen = GetFullPathName(".", 0, buffer, NULL); buffer = new char[buflen + 1]; buflen = GetFullPathName(".", buflen + 1, buffer, NULL); - std::string srcPath = buffer; delete[] buffer; // get the destination path std::string correctPath(fileName.getDrive() + fileName.getPath()); diff --git a/engine/shared/library/sharedUtility/src/shared/DataTableWriter.cpp b/engine/shared/library/sharedUtility/src/shared/DataTableWriter.cpp index 99ba514f..6fd90bb1 100644 --- a/engine/shared/library/sharedUtility/src/shared/DataTableWriter.cpp +++ b/engine/shared/library/sharedUtility/src/shared/DataTableWriter.cpp @@ -139,8 +139,6 @@ inline void DataTableWriter::NamedDataTable::setName(const std::string& name) std::string & DataTableWriterNamespace::unquotify(std::string &s) { - static const std::string quote = "\""; - //First strip any beginning end quotes. if (s.length() >= 2) { diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/api.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/api.cpp index c9f69290..3af047a2 100644 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/api.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/api.cpp @@ -280,7 +280,6 @@ namespace API_NAMESPACE void CommonAPI::OnTerminated(TcpConnection * connection) #endif { - std::string host; HostMap_t::iterator iter; ApiConnectionInfo * pInfo = FindConnectionInfo(connection); bool isShuttingDown = pInfo ? (pInfo->mIsShuttingDown && pInfo->mOutstandingRequests.empty()) : false; diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiPinned.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiPinned.cpp index b743eb24..5a1dd30d 100644 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiPinned.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiPinned.cpp @@ -227,7 +227,6 @@ namespace NAMESPACE void CommonAPI::OnTerminated(TcpConnection * connection) #endif { - std::string host; HostMap_t::iterator iter; if ((iter = mHostMap[0].find(connection)) != mHostMap[0].end()) {