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

Fix compiler warnings in test_spellfix1.c

Browse Source 
FossilOrigin-Name: ebb08d0b4d1ed674e4a23c3754206ca2df9063ff
This commit is contained in:
drh 2012-09-03 12:40:32 +00:00
parent 2a78169563
commit 9265d0bdc2
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Add\sresources\sdescribing\sthe\sversion\snumber\sand\sother\sinformation\sto\sEXEs\nand\sDLLs\sgenerated\susing\sMSVC. C Fix\scompiler\swarnings\sin\stest_spellfix1.c
D 2012-09-03T11:39:59.391 D 2012-09-03T12:40:32.238
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -222,7 +222,7 @@ F src/test_quota.h 8761e463b25e75ebc078bd67d70e39b9c817a0cb
F src/test_rtree.c aba603c949766c4193f1068b91c787f57274e0d9 F src/test_rtree.c aba603c949766c4193f1068b91c787f57274e0d9
F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0 F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
F src/test_server.c 2f99eb2837dfa06a4aacf24af24c6affdf66a84f F src/test_server.c 2f99eb2837dfa06a4aacf24af24c6affdf66a84f
F src/test_spellfix.c 0f03970686403fe33fca1a74b0b60af42fb5929e F src/test_spellfix.c 76dd8d3111d2f5354c374f71fa23b752bd0b029c
F src/test_stat.c d1569c7a4839f13e80187e2c26b2ab4da2d03935 F src/test_stat.c d1569c7a4839f13e80187e2c26b2ab4da2d03935
F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd
F src/test_syscall.c a992d8c80ea91fbf21fb2dd570db40e77dd7e6ae F src/test_syscall.c a992d8c80ea91fbf21fb2dd570db40e77dd7e6ae
@ -1014,7 +1014,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
P 7536101317c00fbb5bf555120feb55b9bc40e8ba 3af7c1a6afacea7b5e47bebce2541aa340c6e946 P a15a70840e1af55ffe4035f53e894a2d582d8f74
R d73e64771e785a3e221346e08be6714e R 8bdf9ef517616ac5a5043f12bec4acdb
U drh U drh
Z 8fd21ce3038c1c5a5efd757200a7f3c6 Z ba78db3487c242fdc928a99a33b20e48

2
manifest.uuid
View File

@ -1 +1 @@
a15a70840e1af55ffe4035f53e894a2d582d8f74 ebb08d0b4d1ed674e4a23c3754206ca2df9063ff

10
src/test_spellfix.c
View File

@ -1894,7 +1894,7 @@ static int spellfix1Init(
int rc = SQLITE_OK; int rc = SQLITE_OK;
int i; int i;
nDbName = strlen(zDbName); nDbName = (int)strlen(zDbName);
pNew = sqlite3_malloc( sizeof(*pNew) + nDbName + 1); pNew = sqlite3_malloc( sizeof(*pNew) + nDbName + 1);
if( pNew==0 ){ if( pNew==0 ){
rc = SQLITE_NOMEM; rc = SQLITE_NOMEM;
@ -2234,7 +2234,7 @@ static void spellfix1RunQuery(MatchQuery *p, const char *zQuery, int nQuery){
p->rc = SQLITE_NOMEM; p->rc = SQLITE_NOMEM;
return; return;
} }
nClass = strlen(zClass); nClass = (int)strlen(zClass);
if( nClass>SPELLFIX_MX_HASH-2 ){ if( nClass>SPELLFIX_MX_HASH-2 ){
nClass = SPELLFIX_MX_HASH-2; nClass = SPELLFIX_MX_HASH-2;
zClass[nClass] = 0; zClass[nClass] = 0;
@ -2408,7 +2408,7 @@ static int spellfix1FilterForMatch(
x.rc = SQLITE_NOMEM; x.rc = SQLITE_NOMEM;
goto filter_exit; goto filter_exit;
} }
nPattern = strlen(zPattern); nPattern = (int)strlen(zPattern);
if( zPattern[nPattern-1]=='*' ) nPattern--; if( zPattern[nPattern-1]=='*' ) nPattern--;
zSql = sqlite3_mprintf( zSql = sqlite3_mprintf(
"SELECT id, word, rank, k1" "SELECT id, word, rank, k1"
@ -2569,9 +2569,9 @@ static int spellfix1Column(
case SPELLFIX_COL_MATCHLEN: { case SPELLFIX_COL_MATCHLEN: {
int iMatchlen = pCur->a[pCur->iRow].iMatchlen; int iMatchlen = pCur->a[pCur->iRow].iMatchlen;
if( iMatchlen<0 ){ if( iMatchlen<0 ){
int nPattern = strlen(pCur->zPattern); int nPattern = (int)strlen(pCur->zPattern);
char *zWord = pCur->a[pCur->iRow].zWord; char *zWord = pCur->a[pCur->iRow].zWord;
int nWord = strlen(zWord); int nWord = (int)strlen(zWord);
if( nPattern>0 && pCur->zPattern[nPattern-1]=='*' ){ if( nPattern>0 && pCur->zPattern[nPattern-1]=='*' ){
char *zTranslit; char *zTranslit;