paulhorn/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a macro in func.c that causes problems for the amalgamation. (CVS 4605)

Browse Source 
FossilOrigin-Name: 6adbe91efffc6b3f53dae87494430ede61d40ecc
This commit is contained in:
drh
2007-12-10 18:07:20 +00:00
parent ea4ee79046
commit 6ed4b78123
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/func.c
+8 -8
View File
@@ -16,7 +16,7 @@
** sqliteRegisterBuildinFunctions() found at the bottom of the file.
** All other code has file scope.
**
** $Id: func.c,v 1.178 2007/12/07 18:39:05 drh Exp $
** $Id: func.c,v 1.179 2007/12/10 18:07:21 drh Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -413,9 +413,9 @@ struct compareInfo {
*/
#if defined(SQLITE_EBCDIC)
# define sqlite3Utf8Read(A,B,C) (*(A++))
# define UpperToLower(A) A = sqlite3UpperToLower[A]
# define GlogUpperToLower(A) A = sqlite3UpperToLower[A]
#else
# define UpperToLower(A) if( A<0x80 ){ A = sqlite3UpperToLower[A]; }
# define GlogUpperToLower(A) if( A<0x80 ){ A = sqlite3UpperToLower[A]; }
#endif
static const struct compareInfo globInfo = { '*', '?', '[', 0 };
@@ -494,11 +494,11 @@ static int patternCompare(
}
while( (c2 = sqlite3Utf8Read(zString,0,&zString))!=0 ){
if( noCase ){
UpperToLower(c2);
UpperToLower(c);
GlogUpperToLower(c2);
GlogUpperToLower(c);
while( c2 != 0 && c2 != c ){
c2 = sqlite3Utf8Read(zString, 0, &zString);
UpperToLower(c2);
GlogUpperToLower(c2);
}
}else{
while( c2 != 0 && c2 != c ){
@@ -550,8 +550,8 @@ static int patternCompare(
}else{
c2 = sqlite3Utf8Read(zString, 0, &zString);
if( noCase ){
UpperToLower(c);
UpperToLower(c2);
GlogUpperToLower(c);
GlogUpperToLower(c2);
}
if( c!=c2 ){
return 0;