diff --git a/ext/fts3/fts3_snippet.c b/ext/fts3/fts3_snippet.c index 8b8a67380d..d78d19856a 100644 --- a/ext/fts3/fts3_snippet.c +++ b/ext/fts3/fts3_snippet.c @@ -213,6 +213,8 @@ static int fts3ExprLoadDoclistsCb1(Fts3Expr *pExpr, int iPhrase, void *ctx){ int rc = SQLITE_OK; LoadDoclistCtx *p = (LoadDoclistCtx *)ctx; + UNUSED_PARAMETER(iPhrase); + p->nPhrase++; p->nToken += pExpr->pPhrase->nToken; @@ -233,6 +235,8 @@ static int fts3ExprLoadDoclistsCb1(Fts3Expr *pExpr, int iPhrase, void *ctx){ ** fts3ExprLoadDoclists(). */ static int fts3ExprLoadDoclistsCb2(Fts3Expr *pExpr, int iPhrase, void *ctx){ + UNUSED_PARAMETER(iPhrase); + UNUSED_PARAMETER(ctx); if( pExpr->aDoclist ){ pExpr->pCurrent = pExpr->aDoclist; pExpr->iCurrent = 0; @@ -522,7 +526,7 @@ static int fts3StringAppend( int nAppend /* Size of zAppend in bytes (or -1) */ ){ if( nAppend<0 ){ - nAppend = strlen(zAppend); + nAppend = (int)strlen(zAppend); } /* If there is insufficient space allocated at StrBuffer.z, use realloc() @@ -1024,6 +1028,7 @@ static int fts3ExprTermOffsetInit(Fts3Expr *pExpr, int iPhrase, void *ctx){ char *pList; /* Pointer to position list for phrase */ int iPos = 0; /* First position in position-list */ + UNUSED_PARAMETER(iPhrase); pList = sqlite3Fts3FindPositions(pExpr, p->iDocid, p->iCol); nTerm = pExpr->pPhrase->nToken; if( pList ){ diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c index e30aef7116..23b8866049 100644 --- a/ext/fts3/fts3_write.c +++ b/ext/fts3/fts3_write.c @@ -2274,9 +2274,11 @@ static void fts3DecodeIntArray( int nBuf /* size of the BLOB */ ){ int i, j; + UNUSED_PARAMETER(nBuf); for(i=j=0; inColumn+1) ); + memset(a, 0, sizeof(u32)*(p->nColumn+1) ); } sqlite3_reset(pStmt); - if( nChng<0 && a[0]<-nChng ){ + if( nChng<0 && a[0]<(u32)(-nChng) ){ a[0] = 0; }else{ a[0] += nChng; diff --git a/manifest b/manifest index bd63d3549a..dc221a18c5 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -C Fix\sto\sthe\sdatabase\sconnection\svalidity\schecker.\s\sOther\stest\scoverage\nenhancements. -D 2010-02-25T23:44:15 +C Minor\schanges\sto\ssilence\ssome\scompiler\swarnings\swith\sMSVC. +D 2010-02-26T01:46:54 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -67,11 +64,11 @@ F ext/fts3/fts3_hash.c 3c8f6387a4a7f5305588b203fa7c887d753e1f1c F ext/fts3/fts3_hash.h 8331fb2206c609f9fc4c4735b9ab5ad6137c88ec F ext/fts3/fts3_icu.c ac494aed69835008185299315403044664bda295 F ext/fts3/fts3_porter.c 7546e4503e286a67fd4f2a82159620e3e9c7a1bc -F ext/fts3/fts3_snippet.c 9cba9a321fbea2e73a2de8cdd0003e4b1717130c +F ext/fts3/fts3_snippet.c 9cb2e78f4d09f30ea7861ee3fc9b7221ae948c8e F ext/fts3/fts3_tokenizer.c 1a49ee3d79cbf0b9386250370d9cbfe4bb89c8ff F ext/fts3/fts3_tokenizer.h 13ffd9fcb397fec32a05ef5cd9e0fa659bf3dbd3 F ext/fts3/fts3_tokenizer1.c b6d86d1d750787db5c168c73da4e87670ed890a1 -F ext/fts3/fts3_write.c 26b1151e601aee83adf82e8727bb896e4b91ce4b +F ext/fts3/fts3_write.c bff9bea026d6e627ab8e78e2ade310981128e0bd F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100 F ext/icu/README.txt 3b130aa66e7a681136f6add198b076a2f90d1e33 F ext/icu/icu.c 850e9a36567bbcce6bd85a4b68243cad8e3c2de2 @@ -112,7 +109,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34 F src/backup.c b293534bc2df23c57668a585b17ee7faaaef0939 F src/bitvec.c 06ad2c36a9c3819c0b9cbffec7b15f58d5d834e0 F src/btmutex.c 96a12f50f7a17475155971a241d85ec5171573ff -F src/btree.c 0fc16c6faa2358ad5d892da528cedaade06b70e4 +F src/btree.c fa6f583496cd84a1490d7b51231679a7b1707555 F src/btree.h 0e193b7e90f1d78b79c79474040e3d66a553a4fa F src/btreeInt.h 71ed5e7f009caf17b7dc304350b3cb64b5970135 F src/build.c 11100b66fb97638d2d874c1d34d8db90650bb1d7 @@ -214,7 +211,7 @@ F src/update.c c0dc6b75ad28b76b619042d934f337b02acee208 F src/utf.c dad16adcc0c35ef2437dca125a4b07419d361052 F src/util.c 0a28d634d41031be63da19cc7cdfbc4a7e0bfea6 F src/vacuum.c deb50c41c39849770ab1bf27e8a35ba1036e3962 -F src/vdbe.c 6de14d95ade1193f2a694ce673f69ac20032fa17 +F src/vdbe.c 8b705e48cf4b6d0493ad0f109763d60c1b429487 F src/vdbe.h 471f6a3dcec4817ca33596fe7f6654d56c0e75f3 F src/vdbeInt.h ae1e6ba0dd3fb4a886898d2829d748be701b01f8 F src/vdbeapi.c 74c25680046a116b24b95393914d3669c23305dc @@ -795,14 +792,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P d986e9289388fd72257b26cb2f9c972177255cd4 -R af8ab02c230217b95a74eec41f7db4ef -U drh -Z 92bbdbd809aca6154a1ba44c761f4d15 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFLhwtSoxKgR168RlERAiPdAJ9I+vTQM4qOnnLxOSTsB57ZAynIbwCggZiC -VIO6ZAEyzKFZ08ul9s3wUMk= -=f8rU ------END PGP SIGNATURE----- +P 0f6291bbbd31673e2a65f38c7fc364c33719d25e +R 0416664a3dc7f6b03e53bf4af7ac78bd +U shaneh +Z ea521e1682af37a17d6d1d2bff6e15f9 diff --git a/manifest.uuid b/manifest.uuid index a7735b3eaa..bdbc2c0350 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0f6291bbbd31673e2a65f38c7fc364c33719d25e \ No newline at end of file +4927c62d6214d93e582bf1266215ed3519630c15 \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index 7daeacd5e8..a54366241a 100644 --- a/src/btree.c +++ b/src/btree.c @@ -4928,8 +4928,8 @@ static int freePage2(BtShared *pBt, MemPage *pMemPage, Pgno iPage){ /* If the secure_delete option is enabled, then ** always fully overwrite deleted information with zeros. */ - if( (!pPage && (rc = btreeGetPage(pBt, iPage, &pPage, 0))) - || (rc = sqlite3PagerWrite(pPage->pDbPage)) + if( (!pPage && ((rc = btreeGetPage(pBt, iPage, &pPage, 0))!=0) ) + || ((rc = sqlite3PagerWrite(pPage->pDbPage))!=0) ){ goto freepage_out; } diff --git a/src/vdbe.c b/src/vdbe.c index 746be2aae4..7eae498985 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -538,7 +538,7 @@ static int checkSavepointCount(sqlite3 *db){ int sqlite3VdbeExec( Vdbe *p /* The VDBE */ ){ - int pc; /* The program counter */ + int pc=0; /* The program counter */ Op *aOp = p->aOp; /* Copy of p->aOp */ Op *pOp; /* Current operation */ int rc = SQLITE_OK; /* Value to return */