R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use appropriate type for CFactory::GetVersionIndex

Browse Source 
svInterfaceName.length() is size_t, and substr takes size_t.
This commit is contained in:
Kawe Mazidjatari 2022-06-18 17:52:32 +02:00
parent e110aa5832
commit daa931ef64
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
r5dev/vpc/interfaces.cpp
View File

@ -14,7 +14,7 @@
//---------------------------------------------------------------------------------
void CFactory::AddFactory(const string& svFactoryName, void* pFactory)
{
int nVersionIndex = GetVersionIndex(svFactoryName);
size_t nVersionIndex = GetVersionIndex(svFactoryName);
FactoryInfo factoryInfo = FactoryInfo(svFactoryName, svFactoryName.substr(0, nVersionIndex),
svFactoryName.substr(nVersionIndex), reinterpret_cast<uintptr_t>(pFactory));
@ -35,10 +35,10 @@ void CFactory::AddFactory(FactoryInfo factoryInfo)
// Input : svInterfaceName -
// Output : index of version in input interface string
//---------------------------------------------------------------------------------
int CFactory::GetVersionIndex(const string& svInterfaceName) const
size_t CFactory::GetVersionIndex(const string& svInterfaceName) const
{
int nVersionIndex = 0;
for (int i = 0; i < svInterfaceName.length(); i++) // Loop through each charater to find the start of interface version.
size_t nVersionIndex = 0;
for (size_t i = 0; i < svInterfaceName.length(); i++) // Loop through each charater to find the start of interface version.
{
if (std::isdigit(svInterfaceName[i]))
{
@ -58,7 +58,7 @@ void CFactory::GetFactoriesFromRegister(void)
it; it = it->m_pNextInterfacePtr) // Loop till we go out of scope.
{
string svInterfaceName = it->m_pInterfaceName; // Get copy of the name.
int nVersionIndex = GetVersionIndex(svInterfaceName);
size_t nVersionIndex = GetVersionIndex(svInterfaceName);
// Push back the interface.
AddFactory(FactoryInfo(svInterfaceName, svInterfaceName.substr(0, nVersionIndex),

2
r5dev/vpc/interfaces.h
View File

@ -79,7 +79,7 @@ class CFactory
public:
void AddFactory(const string& svFactoryName, void* pFactory);
void AddFactory(FactoryInfo factoryInfo);
int GetVersionIndex(const string& svInterfaceName) const;
size_t GetVersionIndex(const string& svInterfaceName) const;
void GetFactoriesFromRegister(void);
CMemory GetFactoryPtr(const string& factoryName, bool versionLess = true) const;