thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #182 from fingolfin/forbid-ctype

Browse source 
ALL: Avoid using is* macros from ctype.h
This commit is contained in:
Willem Jan Palenstijn 2012-02-21 11:33:32 -08:00
commit 9ffe3e11d9
41 changed files with 236 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common/str.cpp
View file

@ -405,13 +405,13 @@ void String::trim() {
makeUnique();
// Trim trailing whitespace
while (_size >= 1 && isspace(static_cast<unsigned char>(_str[_size - 1])))
while (_size >= 1 && isSpace(_str[_size - 1]))
--_size;
_str[_size] = 0;
// Trim leading whitespace
char *t = _str;
while (isspace((unsigned char)*t))
while (isSpace(*t))
t++;
if (t != _str) {
@ -606,14 +606,14 @@ String operator+(const String &x, char y) {
}
char *ltrim(char *t) {
while (isspace(static_cast<unsigned char>(*t)))
while (isSpace(*t))
t++;
return t;
}
char *rtrim(char *t) {
int l = strlen(t) - 1;
while (l >= 0 && isspace(static_cast<unsigned char>(t[l])))
while (l >= 0 && isSpace(t[l]))
t[l--] = 0;
return t;
}