diff options
| author | jackpoz <giacomopoz@gmail.com> | 2017-02-25 17:07:22 +0100 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2017-02-25 17:07:22 +0100 |
| commit | 8f2bcd79da39ef9448938842de32b6f8572facdf (patch) | |
| tree | b2c544cd7fd10a2b83ce5924d6532f4065dc0d3e /src/tools | |
| parent | bb6b1e794fce5e4301c4c55f9e405b2e151c4fdb (diff) | |
Core/Misc: Fix static analysis issues
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/map_extractor/System.cpp | 2 | ||||
| -rw-r--r-- | src/tools/vmap4_extractor/adtfile.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index 71f4631efb7..c681e669ebe 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -180,7 +180,7 @@ uint32 ReadBuild(int locale) size_t pos = text.find("version=\""); size_t pos1 = pos + strlen("version=\""); - size_t pos2 = text.find("\"",pos1); + size_t pos2 = text.find('"',pos1); if (pos == text.npos || pos2 == text.npos || pos1 >= pos2) { printf("Fatal error: Invalid %s file format!\n", filename.c_str()); diff --git a/src/tools/vmap4_extractor/adtfile.cpp b/src/tools/vmap4_extractor/adtfile.cpp index a282b54fbbd..bb9f69f4be7 100644 --- a/src/tools/vmap4_extractor/adtfile.cpp +++ b/src/tools/vmap4_extractor/adtfile.cpp @@ -92,8 +92,8 @@ bool ADTFile::init(uint32 map_num, uint32 tileX, uint32 tileY) Adtfilename.erase(Adtfilename.find(".adt"),4); std::string TempMapNumber; TempMapNumber = Adtfilename.substr(Adtfilename.length()-6,6); - xMap = TempMapNumber.substr(TempMapNumber.find("_")+1,(TempMapNumber.find_last_of("_")-1) - (TempMapNumber.find("_"))); - yMap = TempMapNumber.substr(TempMapNumber.find_last_of("_")+1,(TempMapNumber.length()) - (TempMapNumber.find_last_of("_"))); + xMap = TempMapNumber.substr(TempMapNumber.find('_')+1,(TempMapNumber.find_last_of('_')-1) - (TempMapNumber.find('_'))); + yMap = TempMapNumber.substr(TempMapNumber.find_last_of('_')+1,(TempMapNumber.length()) - (TempMapNumber.find_last_of('_'))); Adtfilename.erase((Adtfilename.length()-xMap.length()-yMap.length()-2), (xMap.length()+yMap.length()+2)); //string AdtMapNumber = xMap + ' ' + yMap + ' ' + GetPlainName((char*)Adtfilename.c_str()); //printf("Processing map %s...\n", AdtMapNumber.c_str()); |