diff options
| author | Willem Jan Palenstijn | 2012-02-21 11:33:32 -0800 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2012-02-21 11:33:32 -0800 |
| commit | 9ffe3e11d905b5af194dd3265e2fe11545bf5020 (patch) | |
| tree | f9fb97d7eb2368d0123aa3bd9d91c560cded3315 /common/config-file.cpp | |
| parent | 80b34398174973b6d70673fce94a8a1f670c3f4d (diff) | |
| parent | 02ebd552141173775b9462f4414083d3b8d49a80 (diff) | |
| download | scummvm-rg350-9ffe3e11d905b5af194dd3265e2fe11545bf5020.tar.gz scummvm-rg350-9ffe3e11d905b5af194dd3265e2fe11545bf5020.tar.bz2 scummvm-rg350-9ffe3e11d905b5af194dd3265e2fe11545bf5020.zip | |
Merge pull request #182 from fingolfin/forbid-ctype
ALL: Avoid using is* macros from ctype.h
Diffstat (limited to 'common/config-file.cpp')
| -rw-r--r-- | common/config-file.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/config-file.cpp b/common/config-file.cpp index 81e0ae6b45..4224d7491d 100644 --- a/common/config-file.cpp +++ b/common/config-file.cpp @@ -30,7 +30,7 @@ namespace Common { bool ConfigFile::isValidName(const String &name) { const char *p = name.c_str(); - while (*p && (isalnum(static_cast<unsigned char>(*p)) || *p == '-' || *p == '_' || *p == '.')) + while (*p && (isAlnum(*p) || *p == '-' || *p == '_' || *p == '.')) p++; return *p == 0; } @@ -108,7 +108,7 @@ bool ConfigFile::loadFromStream(SeekableReadStream &stream) { // is, verify that it only consists of alphanumerics, // periods, dashes and underscores). Mohawk Living Books games // can have periods in their section names. - while (*p && (isalnum(static_cast<unsigned char>(*p)) || *p == '-' || *p == '_' || *p == '.')) + while (*p && (isAlnum(*p) || *p == '-' || *p == '_' || *p == '.')) p++; if (*p == '\0') @@ -131,7 +131,7 @@ bool ConfigFile::loadFromStream(SeekableReadStream &stream) { // Skip leading whitespaces const char *t = line.c_str(); - while (isspace(static_cast<unsigned char>(*t))) + while (isSpace(*t)) t++; // Skip empty lines / lines with only whitespace |