diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2012-11-30 12:29:58 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-06 20:30:31 +0100 |
commit | 4f02eb34cb85a498aebf0b148a9c1e36ebe081c9 (patch) | |
tree | c27d335d9c228fb05054efe4b376c0aa5380c787 /libmsi/tokenize.c | |
parent | 1ece2a5f8a187d4493c96aff3a1ad64eeb497bcb (diff) | |
download | msitools-4f02eb34cb85a498aebf0b148a9c1e36ebe081c9.tar.gz msitools-4f02eb34cb85a498aebf0b148a9c1e36ebe081c9.tar.xz msitools-4f02eb34cb85a498aebf0b148a9c1e36ebe081c9.zip |
abandon camelcase
Diffstat (limited to 'libmsi/tokenize.c')
-rw-r--r-- | libmsi/tokenize.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmsi/tokenize.c b/libmsi/tokenize.c index 0ddf14e..007411e 100644 --- a/libmsi/tokenize.c +++ b/libmsi/tokenize.c @@ -87,7 +87,7 @@ static const Keyword aKeywordTable[] = { /* ** Comparison function for binary search. */ -static int compKeyword(const void *m1, const void *m2){ +static int sql_compare_keyword(const void *m1, const void *m2){ const WCHAR *p = m1; const Keyword *k = m2; const char *q = k->zName; @@ -111,7 +111,7 @@ static int compKeyword(const void *m1, const void *m2){ ** keyword. If it is a keyword, the token code of that keyword is ** returned. If the input is not a keyword, TK_ID is returned. */ -static int sqliteKeywordCode(const WCHAR *z, int n){ +static int sqlite_find_keyword(const WCHAR *z, int n){ WCHAR str[MAX_TOKEN_LEN+1]; Keyword *r; @@ -120,7 +120,7 @@ static int sqliteKeywordCode(const WCHAR *z, int n){ memcpy( str, z, n*sizeof (WCHAR) ); str[n] = 0; - r = bsearch( str, aKeywordTable, KEYWORD_COUNT, sizeof (Keyword), compKeyword ); + r = bsearch( str, aKeywordTable, KEYWORD_COUNT, sizeof (Keyword), sql_compare_keyword ); if( r ) return r->tokenType; return TK_ID; @@ -163,7 +163,7 @@ static const char isIdChar[] = { ** -1 if the token is (or might be) incomplete. Store the token ** type in *tokenType before returning. */ -int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip){ +int sql_get_token(const WCHAR *z, int *tokenType, int *skip){ int i; *skip = 0; @@ -254,7 +254,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip){ break; } for(i=1; isIdChar[z[i]]; i++){} - *tokenType = sqliteKeywordCode(z, i); + *tokenType = sqlite_find_keyword(z, i); if( *tokenType == TK_ID && z[i] == '`' ) *skip = 1; return i; } |