potentially breaking: unused vars

This commit is contained in:
DarthArgus
2014-10-26 23:28:34 -07:00
parent 982290924a
commit 4d2287d072
27 changed files with 2 additions and 35 deletions
@@ -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);
@@ -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 )
@@ -80,7 +80,6 @@ void AiCombatPulseQueue::setAiMaxWaitTimeMs(unsigned int amount)
void AiCombatPulseQueue::alter(real time)
{
int count = 0;
static const std::vector<int8> emptyVector;
unsigned long timeMs = Clock::getFrameStartTimeMs() + static_cast<unsigned long>(time * 1000.0f);
s_timeOrderedAi.clear();
@@ -166,7 +166,6 @@ bool ConsoleCommandParserAi::performParsing(const NetworkId & userId, const Stri
}
AICreatureController * const aiCreatureController = AICreatureController::getAiCreatureController(targetNetworkId);
Unicode::String systemMessage;
if (aiCreatureController == NULL)
{
@@ -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;
@@ -541,7 +541,6 @@ void ServerImageDesignerManager::sendSessionToScript(SharedImageDesignerManager:
std::vector<float> morphValues;
std::vector<const char *> indexKeys;
std::vector<int> indexValues;
std::vector<const char *> holoEmotes;
for(std::map<std::string, float>::const_iterator i = session.morphChanges.begin(); i != session.morphChanges.end(); ++i)
{
morphKeys.push_back(i->first.c_str());
@@ -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;
@@ -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()));
}
@@ -252,7 +252,6 @@ void HarvesterInstallationObject::selectResource (const NetworkId & resourceType
if (isAuthoritative())
{
bool found=false;
std::vector<NetworkId> pools;
if (!m_survey)
takeSurvey();
@@ -1086,7 +1086,6 @@ void ManufactureSchematicObject::addSlotComponent(const StringId & name,
std::vector<int> attribBonuses;
if (component.getAttribBonuses(attribBonuses))
{
const std::string bonusObjVarName(componentCopyName + "." + OBJVAR_ATTRIBUTE_BONUSES);
std::vector<float> 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<ResourceContainerObject *> crateList;
Crafting::IngredientSlot slotData;
ContainerIterator iter;
Crafting::Ingredients::const_iterator ingredientIter;
@@ -1151,7 +1151,6 @@ bool PlayerObject::requestCraftingSession(const NetworkId & toolId)
VolumeContainer const * const inventoryContainer = ContainerInterface::getVolumeContainer(*inventory);
if (inventoryContainer)
{
std::vector<Unicode::String> objList;
for (ContainerConstIterator iter(inventoryContainer->begin()); iter != inventoryContainer->end(); ++iter)
{
CachedNetworkId const & objId = (*iter);
@@ -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."));
@@ -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())
@@ -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)
@@ -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());
@@ -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)
{
@@ -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<int>(strlen(path));
int const outputLength = static_cast<int>(strlen(buffer)) - pathLength;
if (outputLength > outputPathBufferSize)
return false;
@@ -105,7 +105,6 @@ void HyperspaceManager::install()
return;
}
DataTable const * const hyperspaceLocationsTable = DataTableManager::getTable(cms_hyperspaceLocationsTableName, true);
std::string hyperspacePointName;
if(hyperspaceLocationsTable)
{
HyperspaceLocation hyperspaceLoc;
@@ -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;
@@ -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)
@@ -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;
@@ -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)
@@ -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");
@@ -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());
@@ -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)
{
@@ -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;
@@ -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())
{