From b3431fadf7a22c261c6fe700ccd2427bb9f34354 Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Mon, 29 Aug 2022 23:58:03 +0300 Subject: [PATCH] Fix some warnings --- src/string_parsers.cc | 10 +++++----- src/world_map.cc | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/string_parsers.cc b/src/string_parsers.cc index 6ee786d..445f09c 100644 --- a/src/string_parsers.cc +++ b/src/string_parsers.cc @@ -11,7 +11,7 @@ int strParseInt(char** stringPtr, int* valuePtr) { char *str, *remaining_str; - int v1, v2, v3; + size_t v1, v2, v3; char tmp; if (*stringPtr == NULL) { @@ -55,7 +55,7 @@ int strParseStrFromList(char** stringPtr, int* valuePtr, const char** stringList { int i; char *str, *remaining_str; - int v1, v2, v3; + size_t v1, v2, v3; char tmp; if (*stringPtr == NULL) { @@ -110,7 +110,7 @@ int strParseStrFromList(char** stringPtr, int* valuePtr, const char** stringList int strParseStrFromFunc(char** stringPtr, int* valuePtr, StringParserCallback* callback) { char *str, *remaining_str; - int v1, v2, v3; + size_t v1, v2, v3; char tmp; int result; @@ -159,7 +159,7 @@ int strParseStrFromFunc(char** stringPtr, int* valuePtr, StringParserCallback* c int strParseIntWithKey(char** stringPtr, const char* key, int* valuePtr, const char* delimeter) { char* str; - int v1, v2, v3, v4, v5; + size_t v1, v2, v3, v4, v5; char tmp1, tmp2; int result; @@ -213,7 +213,7 @@ int strParseIntWithKey(char** stringPtr, const char* key, int* valuePtr, const c int strParseKeyValue(char** stringPtr, char* key, int* valuePtr, const char* delimiter) { char* str; - int v1, v2, v3, v4, v5; + size_t v1, v2, v3, v4, v5; char tmp1, tmp2; if (*stringPtr == NULL) { diff --git a/src/world_map.cc b/src/world_map.cc index 21076bb..b679c4e 100644 --- a/src/world_map.cc +++ b/src/world_map.cc @@ -2109,11 +2109,11 @@ int _wmParseTerrainTypes(Config* config, char* string) pch += strspn(pch, " "); - int endPos = strcspn(pch, ","); + size_t endPos = strcspn(pch, ","); char end = pch[endPos]; pch[endPos] = '\0'; - int delimeterPos = strcspn(pch, ":"); + size_t delimeterPos = strcspn(pch, ":"); char delimeter = pch[delimeterPos]; pch[delimeterPos] = '\0'; @@ -2230,7 +2230,7 @@ int worldmapFindTerrainByLookupName(char* string, int* valuePtr) int _wmParseEncounterItemType(char** stringPtr, ENC_BASE_TYPE_38_48* a2, int* a3, const char* delim) { char* string; - int v2, v3; + size_t v2, v3; char tmp, tmp2; int v20; @@ -2368,8 +2368,8 @@ int worldmapConfigParseCondition(char** stringPtr, const char* a2, EncounterCond int worldmapConfigParseConditionEntry(char** stringPtr, const char* a2, int* typePtr, int* operatorPtr, int* paramPtr, int* valuePtr) { char* pch; - int v2; - int v3; + size_t v2; + size_t v3; char tmp; char tmp2; int v57;