mirrors/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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Fix\sa\sbug\sin\sthe\scompilation\sprocedures\sfor\sthe\sLinux\sshared\slibrary\nthat\sincludes\sthe\sTCL\sbindings.\s(CVS\s4604)
D 2007-12-10T17:55:16
C Fix\sa\smacro\sin\sfunc.c\sthat\scauses\sproblems\sfor\sthe\samalgamation.\s(CVS\s4605)
D 2007-12-10T18:07:21
F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
F Makefile.in 30789bf70614bad659351660d76b8e533f3340e9
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -93,7 +93,7 @@ F src/date.c 49c5a6d2de6c12000905b4d36868b07d3011bbf6
F src/delete.c 034b87768c4135a22038a86a205f9d2d5f68a143
F src/experimental.c 1b2d1a6cd62ecc39610e97670332ca073c50792b
F src/expr.c 7c8e3295ddeb835ed081b8573caaf8c3fd7c9f9c
F src/func.c a8548fbc55373505c077cfb57baa43c1e48b71d2
F src/func.c 5b713bbf17bc5e4daf340309666c84a65e08a32c
F src/hash.c 45a7005aac044b6c86bd7e49c44bc15d30006d6c
F src/hash.h 031cd9f915aff27e12262cb9eb570ac1b8326b53
F src/insert.c a090c7258f2be707cca8f0cf376142f141621241
@ -597,7 +597,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
P 0b34a18651764e650faba983be8593992ab2f4a9
R 0e6b235d88b8af7d2e1dcd9ac0a3132e
P d384810a95c97b868a87d090f8dcb903cc82cbf7
R 02ccd20331c3a0f99f895b6e82412309
U drh
Z 4b31417da2d9baee44ae10642701026a
Z f800f34be093e13e0ebe3d12e796a99d

2
manifest.uuid
View File

@ -1 +1 @@
d384810a95c97b868a87d090f8dcb903cc82cbf7
6adbe91efffc6b3f53dae87494430ede61d40ecc

16
src/func.c
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;