database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-19 21:43:15 +03:00
Code Activity

Code cleanup in build.c. (CVS 1265)

Browse Source 
FossilOrigin-Name: 9211e14cf81f4de125bad246d8a289786f2854aa
This commit is contained in:
drh
2004-02-22 18:56:49 +00:00
parent f7a9e1ac87
commit d383401c6a
3 changed files with 18 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Use\ssqliteErrorMsg\sinstead\sof\ssqliteSetString\swhereever\spractical.\s(CVS\s1264) C Code\scleanup\sin\sbuild.c.\s(CVS\s1265)
D 2004-02-22T18:40:57 D 2004-02-22T18:56:49
F Makefile.in cfd75c46b335881999333a9e4b982fa8491f200b F Makefile.in cfd75c46b335881999333a9e4b982fa8491f200b
F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -27,7 +27,7 @@ F src/auth.c 4fa3b05bd19445d1c474d6751c4a508d6ea0abe1
F src/btree.c 0a40efb01fa3a431a16d8604f603431d8c9cebfa F src/btree.c 0a40efb01fa3a431a16d8604f603431d8c9cebfa
F src/btree.h 41cb3ff6ebc3f6da2d0a074e39ff8c7a2287469f F src/btree.h 41cb3ff6ebc3f6da2d0a074e39ff8c7a2287469f
F src/btree_rb.c 32b2cb4285c0fbd53b89de021637b63d52257e54 F src/btree_rb.c 32b2cb4285c0fbd53b89de021637b63d52257e54
F src/build.c 160e623334897d2cc362db34ed0f9bcb10e6fa6a F src/build.c dbeef48d1f6f134d8a3de9f9bb6928812c3fbfee
F src/copy.c 391ce142f6b1faa093867ecee134f61a5028a9af F src/copy.c 391ce142f6b1faa093867ecee134f61a5028a9af
F src/date.c 3025642cee50d5c41aef4a22cbc41aa7e543c922 F src/date.c 3025642cee50d5c41aef4a22cbc41aa7e543c922
F src/delete.c 8e2ff752bf485906effcc64f267cdd7227463567 F src/delete.c 8e2ff752bf485906effcc64f267cdd7227463567
@@ -189,7 +189,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
P 9b3bcde1530091602e551435ffd7820eb79727d5 P 69aac043af7f93e7b3f036622c0ac9261cae1839
R d797e4457343833d61bf9ff409e94242 R 31316bc136a82339f6877cfbb462944f
U drh U drh
Z 97d7595e018edb09b04d76c0b0766e57 Z c273a71cca2efed399051894b17dbdca

2
manifest.uuid
View File

@@ -1 +1 @@
69aac043af7f93e7b3f036622c0ac9261cae1839 9211e14cf81f4de125bad246d8a289786f2854aa

30
src/build.c
View File

@@ -23,7 +23,7 @@
** ROLLBACK ** ROLLBACK
** PRAGMA ** PRAGMA
** **
** $Id: build.c,v 1.172 2004/02/22 18:40:57 drh Exp $ ** $Id: build.c,v 1.173 2004/02/22 18:56:49 drh Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
#include <ctype.h> #include <ctype.h>
@@ -728,35 +728,17 @@ primary_key_exit:
*/ */
int sqliteCollateType(const char *zType, int nType){ int sqliteCollateType(const char *zType, int nType){
int i; int i;
for(i=0; i<nType-1; i++){ for(i=0; i<nType-3; i++){
switch( zType[i] ){ int c = *(zType++) | 0x60;
case 'b': if( (c=='b' || c=='c') && sqliteStrNICmp(zType, "lob", 3)==0 ){
case 'B': {
if( i<nType-3 && sqliteStrNICmp(&zType[i],"blob",4)==0 ){
return SQLITE_SO_TEXT; return SQLITE_SO_TEXT;
} }
break; if( c=='c' && sqliteStrNICmp(zType, "har", 3)==0 ){
}
case 'c':
case 'C': {
if( i<nType-3 && (sqliteStrNICmp(&zType[i],"char",4)==0 ||
sqliteStrNICmp(&zType[i],"clob",4)==0)
){
return SQLITE_SO_TEXT; return SQLITE_SO_TEXT;
} }
break; if( c=='t' && sqliteStrNICmp(zType, "ext", 3)==0 ){
}
case 'x':
case 'X': {
if( i>=2 && sqliteStrNICmp(&zType[i-2],"text",4)==0 ){
return SQLITE_SO_TEXT; return SQLITE_SO_TEXT;
} }
break;
}
default: {
break;
}
}
} }
return SQLITE_SO_NUM; return SQLITE_SO_NUM;
} }