ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALL: Avoid using is* macros from ctype.h

Browse Source 
On some systems, passing signed chars to macros like isspace() etc. lead
to a runtime error. Hence, mark these macros as forbidden by default,
and introduce otherwise equivalent alternatives for them.
This commit is contained in:
Max Horn
2012-02-15 16:51:37 +01:00
parent 37e5b209a7
commit 658080deed
41 changed files with 183 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/xmlparser.cpp
+5 -5
View File
@@ -263,7 +263,7 @@ bool XMLParser::vparseIntegerKey(const char *key, int count, va_list args) {
int *num_ptr;
while (count--) {
while (isspace(static_cast<unsigned char>(*key)))
while (isSpace(*key))
key++;
num_ptr = va_arg(args, int*);
@@ -271,7 +271,7 @@ bool XMLParser::vparseIntegerKey(const char *key, int count, va_list args) {
key = parseEnd;
while (isspace(static_cast<unsigned char>(*key)))
while (isSpace(*key))
key++;
if (count && *key++ != ',')
@@ -463,10 +463,10 @@ bool XMLParser::parse() {
}
bool XMLParser::skipSpaces() {
if (!isspace(static_cast<unsigned char>(_char)))
if (!isSpace(_char))
return false;
while (_char && isspace(static_cast<unsigned char>(_char)))
while (_char && isSpace(_char))
_char = _stream->readByte();
return true;
@@ -516,7 +516,7 @@ bool XMLParser::parseToken() {
_char = _stream->readByte();
}
return isspace(static_cast<unsigned char>(_char)) != 0 || _char == '>' || _char == '=' || _char == '/';
return isSpace(_char) != 0 || _char == '>' || _char == '=' || _char == '/';
}
} // End of namespace Common