Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

64-bit / big-endian fix (sscanf requires pointer to int)

Browse Source 
This was SVN commit r6852.
This commit is contained in:
janwas 2009-05-03 11:53:05 +00:00
parent c4ae6001f9
commit c27365045d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/lib/file/file_system_util.cpp
View File

@ -130,9 +130,9 @@ void fs_NextNumberedFilename(const PIVFS& fs, const VfsPath& pathnameFormat, siz
fs->GetDirectoryEntries(path, &files, 0);
for(size_t i = 0; i < files.size(); i++)
{
size_t number;
int number;
if(sscanf(files[i].Name().c_str(), nameFormat.c_str(), &number) == 1)
maxNumber = std::max(number, maxNumber);
maxNumber = std::max(size_t(number), maxNumber);
}
nextNumber = maxNumber+1;

2
source/lib/file/file_system_util.h
View File

@ -67,7 +67,7 @@ extern LibError fs_ForEachFile(const PIVFS& fs, const VfsPath& path, FileCallbac
* ones (screenshots are a good example).
*
* @param pathnameFormat format string for the pathname; must contain one
* format specifier for a size_t.
* format specifier for an integer.
* example: "screenshots/screenshot%04d.png"
* @param nextNumber in: the first number to try; out: the next number.
* if 0, numbers corresponding to existing files are skipped.