msi: Avoid using isspace()/isdigit() for WCHARs.
Hans Leidekker
hans at codeweavers.com
Thu May 18 03:16:14 CDT 2017
From: Akihiro Sagawa <sagawa.aki at gmail.com>
Found with Coccinelle.
v2: Added explicit int return type to avoid these warnings:
tokenize.c:193:15: warning: return type defaults to ‘int’ [-Wreturn-type]
static inline isDigit(WCHAR c)
^
tokenize.c:201:15: warning: return type defaults to ‘int’ [-Wreturn-type]
static inline isSpace(WCHAR c)
^
Signed-off-by: Akihiro Sagawa <sagawa.aki at gmail.com>
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
---
dlls/msi/tokenize.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c
index 441a54a..1656fd8 100644
--- a/dlls/msi/tokenize.c
+++ b/dlls/msi/tokenize.c
@@ -187,6 +187,21 @@ static const char isIdChar[] = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* Fx */
};
+/*
+** WCHAR safe version of isdigit()
+*/
+static inline int isDigit(WCHAR c)
+{
+ return c >= '0' && c <= '9';
+}
+
+/*
+** WCHAR safe version of isspace(), except '\r'
+*/
+static inline int isSpace(WCHAR c)
+{
+ return c == ' ' || c == '\t' || c == '\n' || c == '\f';
+}
/*
** Return the length of the token that begins at z[0]. Return
@@ -199,7 +214,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip){
*skip = 0;
switch( *z ){
case ' ': case '\t': case '\n': case '\f':
- for(i=1; isspace(z[i]) && z[i] != '\r'; i++){}
+ for(i=1; isSpace(z[i]); i++){}
*tokenType = TK_SPACE;
return i;
case '-':
@@ -265,7 +280,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip){
return i;
}
case '.':
- if( !isdigit(z[1]) ){
+ if( !isDigit(z[1]) ){
*tokenType = TK_DOT;
return 1;
}
@@ -273,7 +288,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip){
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
*tokenType = TK_INTEGER;
- for(i=1; isdigit(z[i]); i++){}
+ for(i=1; isDigit(z[i]); i++){}
return i;
case '[':
for(i=1; z[i] && z[i-1]!=']'; i++){}
--
2.1.4
More information about the wine-patches
mailing list