From 32a9d976f7077b1e360b3ce2c23d61365b19c295 Mon Sep 17 00:00:00 2001 From: ShelbyZ Date: Thu, 19 Oct 2017 07:12:09 -0700 Subject: [PATCH] signed/unsigned mismatch issues - Move for...loop int to size_t - Move int32_t to uint32_t --- src/servers/Server_Lobby/GameConnection.cpp | 2 +- src/servers/Server_Lobby/ServerLobby.cpp | 2 +- src/servers/Server_REST/PlayerMinimal.cpp | 2 +- src/servers/Server_REST/main.cpp | 2 +- src/tools/quest_parser/main.cpp | 10 +++++----- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/servers/Server_Lobby/GameConnection.cpp b/src/servers/Server_Lobby/GameConnection.cpp index 21f45ef3..a2b0d0b2 100644 --- a/src/servers/Server_Lobby/GameConnection.cpp +++ b/src/servers/Server_Lobby/GameConnection.cpp @@ -152,7 +152,7 @@ void Core::Network::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet, ui auto charList = g_restConnector.getCharList( ( char * )m_pSession->getSessionId() ); - int32_t charIndex = 0; + uint32_t charIndex = 0; for( uint8_t i = 0; i < 4; i++ ) { diff --git a/src/servers/Server_Lobby/ServerLobby.cpp b/src/servers/Server_Lobby/ServerLobby.cpp index 6c151da4..95142b9b 100644 --- a/src/servers/Server_Lobby/ServerLobby.cpp +++ b/src/servers/Server_Lobby/ServerLobby.cpp @@ -89,7 +89,7 @@ namespace Core { return false; } std::vector args( argv + 1, argv + argc ); - for( auto i = 0; i + 1 < args.size(); i += 2 ) + for( size_t i = 0; i + 1 < args.size(); i += 2 ) { std::string arg( "" ); std::string val( "" ); diff --git a/src/servers/Server_REST/PlayerMinimal.cpp b/src/servers/Server_REST/PlayerMinimal.cpp index f36a14a1..5bc7c211 100644 --- a/src/servers/Server_REST/PlayerMinimal.cpp +++ b/src/servers/Server_REST/PlayerMinimal.cpp @@ -185,7 +185,7 @@ namespace Core { uint16_t size = static_cast< uint16_t >( m_lookMap.size() ); - for( int32_t i = 0; i < m_lookMap.size(); i++ ) + for( uint32_t i = 0; i < m_lookMap.size(); i++ ) { customize[i] = m_lookMap[i]; } diff --git a/src/servers/Server_REST/main.cpp b/src/servers/Server_REST/main.cpp index 419dc0a6..7173db63 100644 --- a/src/servers/Server_REST/main.cpp +++ b/src/servers/Server_REST/main.cpp @@ -71,7 +71,7 @@ bool loadSettings( int32_t argc, char* argv[] ) } std::vector args( argv + 1, argv + argc ); - for( auto i = 0; i + 1 < args.size(); i += 2 ) + for( size_t i = 0; i + 1 < args.size(); i += 2 ) { std::string arg( "" ); std::string val( "" ); diff --git a/src/tools/quest_parser/main.cpp b/src/tools/quest_parser/main.cpp index f4ec46b1..ff5bc70b 100644 --- a/src/tools/quest_parser/main.cpp +++ b/src/tools/quest_parser/main.cpp @@ -91,7 +91,7 @@ void createScript( boost::shared_ptr< Core::Data::QuestInfo > pQuestData, std::s if( pQuestData->reward_item.size() > 0 ) { rewards += " this.RewardItem = ["; - for( int ca = 0; ca < pQuestData->reward_item.size(); ca++ ) + for( size_t ca = 0; ca < pQuestData->reward_item.size(); ca++ ) { rewards += std::to_string( pQuestData->reward_item.at( ca ) ); if( ca != pQuestData->reward_item.size() - 1 ) @@ -105,7 +105,7 @@ void createScript( boost::shared_ptr< Core::Data::QuestInfo > pQuestData, std::s if( pQuestData->reward_item.size() > 0 ) { rewards += " this.RewardItemCount = ["; - for( int ca = 0; ca < pQuestData->reward_item_count.size(); ca++ ) + for( size_t ca = 0; ca < pQuestData->reward_item_count.size(); ca++ ) { rewards += std::to_string( pQuestData->reward_item_count.at( ca ) ); if( ca != pQuestData->reward_item_count.size() - 1 ) @@ -119,7 +119,7 @@ void createScript( boost::shared_ptr< Core::Data::QuestInfo > pQuestData, std::s if( pQuestData->reward_item_optional.size() > 0 ) { rewards += " this.RewardItemOptional = ["; - for( int ca = 0; ca < pQuestData->reward_item_optional.size(); ca++ ) + for( size_t ca = 0; ca < pQuestData->reward_item_optional.size(); ca++ ) { rewards += std::to_string( pQuestData->reward_item_optional.at( ca ) ); if( ca != pQuestData->reward_item_optional.size() - 1 ) @@ -133,7 +133,7 @@ void createScript( boost::shared_ptr< Core::Data::QuestInfo > pQuestData, std::s if( pQuestData->reward_item_optional_count.size() > 0 ) { rewards += " this.RewardItemOptionalCount = ["; - for( int ca = 0; ca < pQuestData->reward_item_optional_count.size(); ca++ ) + for( size_t ca = 0; ca < pQuestData->reward_item_optional_count.size(); ca++ ) { rewards += std::to_string( pQuestData->reward_item_optional_count.at( ca ) ); if( ca != pQuestData->reward_item_optional_count.size() - 1 ) @@ -151,7 +151,7 @@ void createScript( boost::shared_ptr< Core::Data::QuestInfo > pQuestData, std::s std::vector< std::string > script_entities; std::string sentities = " // Entities found in the script data of the quest\n"; - for( int ca = 0; ca < pQuestData->script_entity.size(); ca ++ ) + for( size_t ca = 0; ca < pQuestData->script_entity.size(); ca ++ ) { if( ( pQuestData->script_entity.at( ca ).find( "HOWTO" ) != std::string::npos ) || ( pQuestData->script_entity.at( ca ).find( "HOW_TO" ) != std::string::npos ) ) continue;