database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-30 19:03:16 +03:00
Code Activity

More harmless compiler warning fixes.

Browse Source 
FossilOrigin-Name: ab69527c1608da0b668f3b49e967661dd99cc3d4
This commit is contained in:
mistachkin
2016-04-12 20:05:06 +00:00
parent 02267cc213
commit 77fac879d2
15 changed files with 57 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/fts3/fts3_test.c
View File

@ -458,7 +458,7 @@ static int testTokenizerNext(
if( pCsr->iLangid & 0x00000001 ){ if( pCsr->iLangid & 0x00000001 ){
for(i=0; i<nToken; i++) pCsr->aBuffer[i] = pToken[i]; for(i=0; i<nToken; i++) pCsr->aBuffer[i] = pToken[i];
}else{ }else{
for(i=0; i<nToken; i++) pCsr->aBuffer[i] = testTolower(pToken[i]); for(i=0; i<nToken; i++) pCsr->aBuffer[i] = (char)testTolower(pToken[i]);
} }
pCsr->iToken++; pCsr->iToken++;
pCsr->iInput = (int)(p - pCsr->aInput); pCsr->iInput = (int)(p - pCsr->aInput);

4
ext/fts5/fts5_hash.c
View File

@ -345,11 +345,11 @@ int sqlite3Fts5HashWrite(
if( pHash->eDetail==FTS5_DETAIL_FULL ){ if( pHash->eDetail==FTS5_DETAIL_FULL ){
pPtr[p->nData++] = 0x01; pPtr[p->nData++] = 0x01;
p->nData += sqlite3Fts5PutVarint(&pPtr[p->nData], iCol); p->nData += sqlite3Fts5PutVarint(&pPtr[p->nData], iCol);
p->iCol = iCol; p->iCol = (i16)iCol;
p->iPos = 0; p->iPos = 0;
}else{ }else{
bNew = 1; bNew = 1;
p->iCol = iPos = iCol; p->iCol = (i16)(iPos = iCol);
} }
} }

2
ext/fts5/fts5_index.c
View File

@ -3244,7 +3244,7 @@ static void fts5IterSetOutputs_Col100(Fts5Iter *pIter, Fts5SegIter *pSeg){
if( aiCol==aiColEnd ) goto setoutputs_col_out; if( aiCol==aiColEnd ) goto setoutputs_col_out;
} }
if( *aiCol==iPrev ){ if( *aiCol==iPrev ){
*aOut++ = (iPrev - iPrevOut) + 2; *aOut++ = (u8)((iPrev - iPrevOut) + 2);
iPrevOut = iPrev; iPrevOut = iPrev;
} }
} }

8
ext/misc/amatch.c
View File

@ -625,10 +625,10 @@ static int amatchLoadOneRule(
}else{ }else{
memset(pRule, 0, sizeof(*pRule)); memset(pRule, 0, sizeof(*pRule));
pRule->zFrom = &pRule->zTo[nTo+1]; pRule->zFrom = &pRule->zTo[nTo+1];
pRule->nFrom = nFrom; pRule->nFrom = (amatch_len)nFrom;
memcpy(pRule->zFrom, zFrom, nFrom+1); memcpy(pRule->zFrom, zFrom, nFrom+1);
memcpy(pRule->zTo, zTo, nTo+1); memcpy(pRule->zTo, zTo, nTo+1);
pRule->nTo = nTo; pRule->nTo = (amatch_len)nTo;
pRule->rCost = rCost; pRule->rCost = rCost;
pRule->iLang = (int)iLang; pRule->iLang = (int)iLang;
} }
@ -1081,7 +1081,7 @@ static void amatchAddWord(
pWord->rCost = rCost; pWord->rCost = rCost;
pWord->iSeq = pCur->nWord++; pWord->iSeq = pCur->nWord++;
amatchWriteCost(pWord); amatchWriteCost(pWord);
pWord->nMatch = nMatch; pWord->nMatch = (short)nMatch;
pWord->pNext = pCur->pAllWords; pWord->pNext = pCur->pAllWords;
pCur->pAllWords = pWord; pCur->pAllWords = pWord;
pWord->sCost.zKey = pWord->zCost; pWord->sCost.zKey = pWord->zCost;
@ -1162,7 +1162,7 @@ static int amatchNext(sqlite3_vtab_cursor *cur){
#endif #endif
nWord = (int)strlen(pWord->zWord+2); nWord = (int)strlen(pWord->zWord+2);
if( nWord+20>nBuf ){ if( nWord+20>nBuf ){
nBuf = nWord+100; nBuf = (char)(nWord+100);
zBuf = sqlite3_realloc(zBuf, nBuf); zBuf = sqlite3_realloc(zBuf, nBuf);
if( zBuf==0 ) return SQLITE_NOMEM; if( zBuf==0 ) return SQLITE_NOMEM;
} }

4
ext/misc/fuzzer.c
View File

@ -344,10 +344,10 @@ static int fuzzerLoadOneRule(
memset(pRule, 0, sizeof(*pRule)); memset(pRule, 0, sizeof(*pRule));
pRule->zFrom = pRule->zTo; pRule->zFrom = pRule->zTo;
pRule->zFrom += nTo + 1; pRule->zFrom += nTo + 1;
pRule->nFrom = nFrom; pRule->nFrom = (fuzzer_len)nFrom;
memcpy(pRule->zFrom, zFrom, nFrom+1); memcpy(pRule->zFrom, zFrom, nFrom+1);
memcpy(pRule->zTo, zTo, nTo+1); memcpy(pRule->zTo, zTo, nTo+1);
pRule->nTo = nTo; pRule->nTo = (fuzzer_len)nTo;
pRule->rCost = nCost; pRule->rCost = nCost;
pRule->iRuleset = (int)iRuleset; pRule->iRuleset = (int)iRuleset;
} }

10
ext/misc/regexp.c
View File

@ -136,7 +136,7 @@ struct ReCompiled {
static void re_add_state(ReStateSet *pSet, int newState){ static void re_add_state(ReStateSet *pSet, int newState){
unsigned i; unsigned i;
for(i=0; i<pSet->nState; i++) if( pSet->aState[i]==newState ) return; for(i=0; i<pSet->nState; i++) if( pSet->aState[i]==newState ) return;
pSet->aState[pSet->nState++] = newState; pSet->aState[pSet->nState++] = (ReStateNumber)newState;
} }
/* Extract the next unicode character from *pzIn and return it. Advance /* Extract the next unicode character from *pzIn and return it. Advance
@ -358,7 +358,7 @@ static int re_insert(ReCompiled *p, int iBefore, int op, int arg){
p->aArg[i] = p->aArg[i-1]; p->aArg[i] = p->aArg[i-1];
} }
p->nState++; p->nState++;
p->aOp[iBefore] = op; p->aOp[iBefore] = (char)op;
p->aArg[iBefore] = arg; p->aArg[iBefore] = arg;
return iBefore; return iBefore;
} }
@ -677,12 +677,12 @@ const char *re_compile(ReCompiled **ppRe, const char *zIn, int noCase){
for(j=0, i=1; j<sizeof(pRe->zInit)-2 && pRe->aOp[i]==RE_OP_MATCH; i++){ for(j=0, i=1; j<sizeof(pRe->zInit)-2 && pRe->aOp[i]==RE_OP_MATCH; i++){
unsigned x = pRe->aArg[i]; unsigned x = pRe->aArg[i];
if( x<=127 ){ if( x<=127 ){
pRe->zInit[j++] = x; pRe->zInit[j++] = (unsigned char)x;
}else if( x<=0xfff ){ }else if( x<=0xfff ){
pRe->zInit[j++] = 0xc0 | (x>>6); pRe->zInit[j++] = (unsigned char)(0xc0 | (x>>6));
pRe->zInit[j++] = 0x80 | (x&0x3f); pRe->zInit[j++] = 0x80 | (x&0x3f);
}else if( x<=0xffff ){ }else if( x<=0xffff ){
pRe->zInit[j++] = 0xd0 | (x>>12); pRe->zInit[j++] = (unsigned char)(0xd0 | (x>>12));
pRe->zInit[j++] = 0x80 | ((x>>6)&0x3f); pRe->zInit[j++] = 0x80 | ((x>>6)&0x3f);
pRe->zInit[j++] = 0x80 | (x&0x3f); pRe->zInit[j++] = 0x80 | (x&0x3f);
}else{ }else{

20
ext/misc/spellfix.c
View File

@ -390,7 +390,7 @@ static int editdist1(const char *zA, const char *zB, int *pnMatch){
/* Special processing if either string is empty */ /* Special processing if either string is empty */
if( nA==0 ){ if( nA==0 ){
cBprev = dc; cBprev = (char)dc;
for(xB=res=0; (cB = zB[xB])!=0; xB++){ for(xB=res=0; (cB = zB[xB])!=0; xB++){
res += insertOrDeleteCost(cBprev, cB, zB[xB+1])/FINAL_INS_COST_DIV; res += insertOrDeleteCost(cBprev, cB, zB[xB+1])/FINAL_INS_COST_DIV;
cBprev = cB; cBprev = cB;
@ -398,7 +398,7 @@ static int editdist1(const char *zA, const char *zB, int *pnMatch){
return res; return res;
} }
if( nB==0 ){ if( nB==0 ){
cAprev = dc; cAprev = (char)dc;
for(xA=res=0; (cA = zA[xA])!=0; xA++){ for(xA=res=0; (cA = zA[xA])!=0; xA++){
res += insertOrDeleteCost(cAprev, cA, zA[xA+1]); res += insertOrDeleteCost(cAprev, cA, zA[xA+1]);
cAprev = cA; cAprev = cA;
@ -420,8 +420,8 @@ static int editdist1(const char *zA, const char *zB, int *pnMatch){
/* Compute the Wagner edit distance */ /* Compute the Wagner edit distance */
m[0] = 0; m[0] = 0;
cx[0] = dc; cx[0] = (char)dc;
cBprev = dc; cBprev = (char)dc;
for(xB=1; xB<=nB; xB++){ for(xB=1; xB<=nB; xB++){
cBnext = zB[xB]; cBnext = zB[xB];
cB = zB[xB-1]; cB = zB[xB-1];
@ -429,7 +429,7 @@ static int editdist1(const char *zA, const char *zB, int *pnMatch){
m[xB] = m[xB-1] + insertOrDeleteCost(cBprev, cB, cBnext); m[xB] = m[xB-1] + insertOrDeleteCost(cBprev, cB, cBnext);
cBprev = cB; cBprev = cB;
} }
cAprev = dc; cAprev = (char)dc;
for(xA=1; xA<=nA; xA++){ for(xA=1; xA<=nA; xA++){
int lastA = (xA==nA); int lastA = (xA==nA);
cA = zA[xA-1]; cA = zA[xA-1];
@ -476,7 +476,7 @@ static int editdist1(const char *zA, const char *zB, int *pnMatch){
d = m[xB]; d = m[xB];
dc = cx[xB]; dc = cx[xB];
m[xB] = totalCost; m[xB] = totalCost;
cx[xB] = ncx; cx[xB] = (char)ncx;
cBprev = cB; cBprev = cB;
} }
cAprev = cA; cAprev = cA;
@ -711,9 +711,9 @@ static int editDist3ConfigLoad(
if( nExtra<0 ) nExtra = 0; if( nExtra<0 ) nExtra = 0;
pCost = sqlite3_malloc64( sizeof(*pCost) + nExtra ); pCost = sqlite3_malloc64( sizeof(*pCost) + nExtra );
if( pCost==0 ){ rc = SQLITE_NOMEM; break; } if( pCost==0 ){ rc = SQLITE_NOMEM; break; }
pCost->nFrom = nFrom; pCost->nFrom = (u8)nFrom;
pCost->nTo = nTo; pCost->nTo = (u8)nTo;
pCost->iCost = iCost; pCost->iCost = (u16)iCost;
memcpy(pCost->a, zFrom, nFrom); memcpy(pCost->a, zFrom, nFrom);
memcpy(pCost->a + nFrom, zTo, nTo); memcpy(pCost->a + nFrom, zTo, nTo);
pCost->pNext = pLang->pCost; pCost->pNext = pLang->pCost;
@ -1616,7 +1616,7 @@ static unsigned char *transliterate(const unsigned char *zIn, int nIn){
zIn += sz; zIn += sz;
nIn -= sz; nIn -= sz;
if( c<=127 ){ if( c<=127 ){
zOut[nOut++] = c; zOut[nOut++] = (unsigned char)c;
}else{ }else{
int xTop, xBtm, x; int xTop, xBtm, x;
xTop = sizeof(translit)/sizeof(translit[0]) - 1; xTop = sizeof(translit)/sizeof(translit[0]) - 1;

2
ext/rbu/sqlite3rbu.c
View File

@ -3356,7 +3356,7 @@ sqlite3 *sqlite3rbu_db(sqlite3rbu *pRbu, int bRbu){
*/ */
static void rbuEditErrmsg(sqlite3rbu *p){ static void rbuEditErrmsg(sqlite3rbu *p){
if( p->rc==SQLITE_CONSTRAINT && p->zErrmsg ){ if( p->rc==SQLITE_CONSTRAINT && p->zErrmsg ){
int i; unsigned int i;
size_t nErrmsg = strlen(p->zErrmsg); size_t nErrmsg = strlen(p->zErrmsg);
for(i=0; i<(nErrmsg-8); i++){ for(i=0; i<(nErrmsg-8); i++){
if( memcmp(&p->zErrmsg[i], "rbu_imp_", 8)==0 ){ if( memcmp(&p->zErrmsg[i], "rbu_imp_", 8)==0 ){

39
manifest
View File

@ -1,5 +1,5 @@
C Compilation\sfix\sfor\sa\sC99-ism\sin\sthe\s'fts3view'\stool. C More\sharmless\scompiler\swarning\sfixes.
D 2016-04-12T19:30:31.230 D 2016-04-12T20:05:06.603
F Makefile.in eba680121821b8a60940a81454316f47a341487a F Makefile.in eba680121821b8a60940a81454316f47a341487a
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
@ -81,7 +81,7 @@ F ext/fts3/fts3_icu.c deb46f7020d87ea7a14a433fb7a7f4bef42a9652
F ext/fts3/fts3_porter.c 3565faf04b626cddf85f03825e86056a4562c009 F ext/fts3/fts3_porter.c 3565faf04b626cddf85f03825e86056a4562c009
F ext/fts3/fts3_snippet.c 68ae118b0f834ea53d2b89e4087fc0f0b8c4ee4e F ext/fts3/fts3_snippet.c 68ae118b0f834ea53d2b89e4087fc0f0b8c4ee4e
F ext/fts3/fts3_term.c 88c55a6fa1a51ab494e33dced0401a6c28791fd7 F ext/fts3/fts3_term.c 88c55a6fa1a51ab494e33dced0401a6c28791fd7
F ext/fts3/fts3_test.c 11e36437b0f3f2266acea5b4787f615e4337a237 F ext/fts3/fts3_test.c a940cf104d545ad1abf926956ce65db2aa5af0cf
F ext/fts3/fts3_tokenize_vtab.c a27593ab19657166f6fa5ec073b678cc29a75860 F ext/fts3/fts3_tokenize_vtab.c a27593ab19657166f6fa5ec073b678cc29a75860
F ext/fts3/fts3_tokenizer.c 3cf21cd2212db17a88d4ef7da0fd8a80275979a1 F ext/fts3/fts3_tokenizer.c 3cf21cd2212db17a88d4ef7da0fd8a80275979a1
F ext/fts3/fts3_tokenizer.h 64c6ef6c5272c51ebe60fc607a896e84288fcbc3 F ext/fts3/fts3_tokenizer.h 64c6ef6c5272c51ebe60fc607a896e84288fcbc3
@ -103,8 +103,8 @@ F ext/fts5/fts5_aux.c daa57fb45216491814520bbb587e97bf81ced458
F ext/fts5/fts5_buffer.c 4c1502d4c956cd092c89ce4480867f9d8bf325cd F ext/fts5/fts5_buffer.c 4c1502d4c956cd092c89ce4480867f9d8bf325cd
F ext/fts5/fts5_config.c 5af9c360e99669d29f06492c370892394aba0857 F ext/fts5/fts5_config.c 5af9c360e99669d29f06492c370892394aba0857
F ext/fts5/fts5_expr.c 5ca4bafe29aa3d27683c90e836192e4aefd20a3f F ext/fts5/fts5_expr.c 5ca4bafe29aa3d27683c90e836192e4aefd20a3f
F ext/fts5/fts5_hash.c f3a7217c86eb8f272871be5f6aa1b6798960a337 F ext/fts5/fts5_hash.c 880998e596b60f078348d48732ca4ad9a90caad2
F ext/fts5/fts5_index.c fdd82bb421a5d1e64d004acb43f4dd9970c8d2b3 F ext/fts5/fts5_index.c b429e23fabb57506f71e406997cc46b89190dc97
F ext/fts5/fts5_main.c b4a0fc5bf17f2f1f056ee76cdd7d2af08b360f55 F ext/fts5/fts5_main.c b4a0fc5bf17f2f1f056ee76cdd7d2af08b360f55
F ext/fts5/fts5_storage.c 3309c6a8e34b974513016fd1ef47c83f5898f94c F ext/fts5/fts5_storage.c 3309c6a8e34b974513016fd1ef47c83f5898f94c
F ext/fts5/fts5_tcl.c f8731e0508299bd43f1a2eff7dbeaac870768966 F ext/fts5/fts5_tcl.c f8731e0508299bd43f1a2eff7dbeaac870768966
@ -203,21 +203,21 @@ F ext/fts5/tool/showfts5.tcl d54da0e067306663e2d5d523965ca487698e722c
F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43 F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
F ext/icu/icu.c 4bdf4c5daedabcd8e6eb6e6a377657f7b978f9f7 F ext/icu/icu.c 4bdf4c5daedabcd8e6eb6e6a377657f7b978f9f7
F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37 F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
F ext/misc/amatch.c a1a8f66c29d40bd71b075546ddeddb477b17a2bb F ext/misc/amatch.c 211108e201105e4bb0c076527b8cfd34330fc234
F ext/misc/closure.c 0d2a038df8fbae7f19de42e7c7d71f2e4dc88704 F ext/misc/closure.c 0d2a038df8fbae7f19de42e7c7d71f2e4dc88704
F ext/misc/compress.c 122faa92d25033d6c3f07c39231de074ab3d2e83 F ext/misc/compress.c 122faa92d25033d6c3f07c39231de074ab3d2e83
F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2 F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2
F ext/misc/fileio.c d4171c815d6543a9edef8308aab2951413cd8d0f F ext/misc/fileio.c d4171c815d6543a9edef8308aab2951413cd8d0f
F ext/misc/fuzzer.c 4c84635c71c26cfa7c2e5848cf49fe2d2cfcd767 F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25
F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
F ext/misc/json1.c b9c88d5c3b6ecd8c731ffdd7f5b3d902857f8c96 F ext/misc/json1.c b9c88d5c3b6ecd8c731ffdd7f5b3d902857f8c96
F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342 F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63 F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63
F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc F ext/misc/regexp.c a68d25c659bd2d893cd1215667bbf75ecb9dc7d4
F ext/misc/rot13.c 1ac6f95f99b575907b9b09c81a349114cf9be45a F ext/misc/rot13.c 1ac6f95f99b575907b9b09c81a349114cf9be45a
F ext/misc/series.c e11e534ada797d5b816d7e7a93c022306563ca35 F ext/misc/series.c e11e534ada797d5b816d7e7a93c022306563ca35
F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52 F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52
F ext/misc/spellfix.c 598bbc45516227701558becdd38f4e6fe8e97cc2 F ext/misc/spellfix.c bf1b922c2750698e9a3d4c50cce6974adb7e93be
F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512 F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512
F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95 F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95
F ext/misc/vtshim.c babb0dc2bf116029e3e7c9a618b8a1377045303e F ext/misc/vtshim.c babb0dc2bf116029e3e7c9a618b8a1377045303e
@ -246,7 +246,7 @@ F ext/rbu/rbufault2.test 9a7f19edd6ea35c4c9f807d8a3db0a03a5670c06
F ext/rbu/rbufts.test 828cd689da825f0a7b7c53ffc1f6f7fdb6fa5bda F ext/rbu/rbufts.test 828cd689da825f0a7b7c53ffc1f6f7fdb6fa5bda
F ext/rbu/rbuprogress.test 2023a7df2c523e3df1cb532eff811cda385a789a F ext/rbu/rbuprogress.test 2023a7df2c523e3df1cb532eff811cda385a789a
F ext/rbu/rbusave.test 0f43b6686084f426ddd040b878426452fd2c2f48 F ext/rbu/rbusave.test 0f43b6686084f426ddd040b878426452fd2c2f48
F ext/rbu/sqlite3rbu.c 007fc4db8c0b95c7ef10162b5864921ef5cc8106 F ext/rbu/sqlite3rbu.c 9097f1d95666dbef72ca61d5b6a13a84660735ac
F ext/rbu/sqlite3rbu.h d7cc99350c10134f358fe1a8997d9225b3f712b2 F ext/rbu/sqlite3rbu.h d7cc99350c10134f358fe1a8997d9225b3f712b2
F ext/rbu/test_rbu.c 3505641a78b723589b8780d5f9b2faeeb73e037d F ext/rbu/test_rbu.c 3505641a78b723589b8780d5f9b2faeeb73e037d
F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
@ -412,11 +412,11 @@ F src/test_intarray.h 9dc57417fb65bc7835cc18548852cc08cc062202
F src/test_journal.c 5360fbe1d1e4416ca36290562fd5a2e3f70f32aa F src/test_journal.c 5360fbe1d1e4416ca36290562fd5a2e3f70f32aa
F src/test_loadext.c 337056bae59f80b9eb00ba82088b39d0f4fe6dfd F src/test_loadext.c 337056bae59f80b9eb00ba82088b39d0f4fe6dfd
F src/test_malloc.c 94c18e88d6df6d471a0d04ddb809f833d1739950 F src/test_malloc.c 94c18e88d6df6d471a0d04ddb809f833d1739950
F src/test_multiplex.c 6a9de820fcaaf506c59aa14bc8693822333cea48 F src/test_multiplex.c eafc567ebe162e36f17b5062285dfe90461cf8e9
F src/test_multiplex.h c08e4e8f8651f0c5e0509b138ff4d5b43ed1f5d3 F src/test_multiplex.h c08e4e8f8651f0c5e0509b138ff4d5b43ed1f5d3
F src/test_mutex.c dbdfaff8580071f2212a0deae3325a93a737819c F src/test_mutex.c dbdfaff8580071f2212a0deae3325a93a737819c
F src/test_onefile.c 38f7cbe79d5bafe95bde683cc3a53b8ca16daf10 F src/test_onefile.c 416f87a28d6d673352d33fc4b1c7d39db878e50f
F src/test_osinst.c 5423dc1d355f594371f27dd292ca54bd320b8196 F src/test_osinst.c ad0233b1dabb0390e25edded4ebd79a2a61538c6
F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00 F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00
F src/test_quota.c 180813f43683be5725458fc1ff13ac455d8e722d F src/test_quota.c 180813f43683be5725458fc1ff13ac455d8e722d
F src/test_quota.h 2a8ad1952d1d2ca9af0ce0465e56e6c023b5e15d F src/test_quota.h 2a8ad1952d1d2ca9af0ce0465e56e6c023b5e15d
@ -1415,7 +1415,7 @@ F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
F tool/lemon.c cfbfe061a4b2766512f6b484882eee2c86a14506 F tool/lemon.c cfbfe061a4b2766512f6b484882eee2c86a14506
F tool/lempar.c 404ea3dc27dbeed343f0e61b1d36e97b9f5f0fb6 F tool/lempar.c 404ea3dc27dbeed343f0e61b1d36e97b9f5f0fb6
F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
F tool/logest.c eef612f8adf4d0993dafed0416064cf50d5d33c6 F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca
F tool/mkautoconfamal.sh e855df211ecbcc7131dee817110ff386cfb112f7 F tool/mkautoconfamal.sh e855df211ecbcc7131dee817110ff386cfb112f7
F tool/mkkeywordhash.c f7f3b342211ac6a14258b9726d5b97cf4f548f22 F tool/mkkeywordhash.c f7f3b342211ac6a14258b9726d5b97cf4f548f22
F tool/mkmsvcmin.tcl 2f12f7fa8858bbe61cf81820a2da96c79ed1ca8d F tool/mkmsvcmin.tcl 2f12f7fa8858bbe61cf81820a2da96c79ed1ca8d
@ -1436,7 +1436,7 @@ F tool/replace.tcl 7727c60a04299b65a92f5e1590896fea0f25b9e0
F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a
F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5 F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5
F tool/run-speed-test.sh f95d19fd669b68c4c38b6b475242841d47c66076 F tool/run-speed-test.sh f95d19fd669b68c4c38b6b475242841d47c66076
F tool/showdb.c 82dca79a999b2701c62417636345e9974151fdad F tool/showdb.c c695a5d5c8110640e0d9fadf5e254da90c79c36e
F tool/showjournal.c 5bad7ae8784a43d2b270d953060423b8bd480818 F tool/showjournal.c 5bad7ae8784a43d2b270d953060423b8bd480818
F tool/showlocks.c 9920bcc64f58378ff1118caead34147201f48c68 F tool/showlocks.c 9920bcc64f58378ff1118caead34147201f48c68
F tool/showstat4.c bda40d6e395df7edb6e9ea630784d3d762c35b4b F tool/showstat4.c bda40d6e395df7edb6e9ea630784d3d762c35b4b
@ -1482,7 +1482,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P a18a6ce2271865d04cd75a8a5baa63798b7393db P bedb88a4b9c808ea781ae69058399a1a3a3d15fa
R d725baf71b4a1cdc4415395863dd2840 R 03018f5836a18841da04ba58f1cc328d
T *branch * warnings
T *sym-warnings *
T -sym-trunk *
U mistachkin U mistachkin
Z 4008d4d2d72bf9083c3fc9e1b20a35f7 Z baaf8c0d1237121c0d8a28eaa252b406

2
manifest.uuid
View File

@ -1 +1 @@
bedb88a4b9c808ea781ae69058399a1a3a3d15fa ab69527c1608da0b668f3b49e967661dd99cc3d4

4
src/test_multiplex.c
View File

@ -539,7 +539,7 @@ static int multiplexOpen(
memset(pGroup, 0, sz); memset(pGroup, 0, sz);
pMultiplexOpen->pGroup = pGroup; pMultiplexOpen->pGroup = pGroup;
pGroup->bEnabled = (unsigned char)-1; pGroup->bEnabled = (unsigned char)-1;
pGroup->bTruncate = sqlite3_uri_boolean(zUri, "truncate", pGroup->bTruncate = (unsigned char)sqlite3_uri_boolean(zUri, "truncate",
(flags & SQLITE_OPEN_MAIN_DB)==0); (flags & SQLITE_OPEN_MAIN_DB)==0);
pGroup->szChunk = (int)sqlite3_uri_int64(zUri, "chunksize", pGroup->szChunk = (int)sqlite3_uri_int64(zUri, "chunksize",
SQLITE_MULTIPLEX_CHUNK_SIZE); SQLITE_MULTIPLEX_CHUNK_SIZE);
@ -978,7 +978,7 @@ static int multiplexFileControl(sqlite3_file *pConn, int op, void *pArg){
case MULTIPLEX_CTRL_ENABLE: case MULTIPLEX_CTRL_ENABLE:
if( pArg ) { if( pArg ) {
int bEnabled = *(int *)pArg; int bEnabled = *(int *)pArg;
pGroup->bEnabled = bEnabled; pGroup->bEnabled = (unsigned char)bEnabled;
rc = SQLITE_OK; rc = SQLITE_OK;
} }
break; break;

2
src/test_onefile.c
View File

@ -508,7 +508,7 @@ static int fsSync(sqlite3_file *pFile, int flags){
if( p->eType==DATABASE_FILE ){ if( p->eType==DATABASE_FILE ){
unsigned char zSize[4]; unsigned char zSize[4];
zSize[0] = (pReal->nDatabase&0xFF000000)>>24; zSize[0] = (pReal->nDatabase&0xFF000000)>>24;
zSize[1] = (pReal->nDatabase&0x00FF0000)>>16; zSize[1] = (unsigned char)((pReal->nDatabase&0x00FF0000)>>16);
zSize[2] = (pReal->nDatabase&0x0000FF00)>>8; zSize[2] = (pReal->nDatabase&0x0000FF00)>>8;
zSize[3] = (pReal->nDatabase&0x000000FF); zSize[3] = (pReal->nDatabase&0x000000FF);
rc = pRealFile->pMethods->xWrite(pRealFile, zSize, 4, 0); rc = pRealFile->pMethods->xWrite(pRealFile, zSize, 4, 0);

6
src/test_osinst.c
View File

@ -644,9 +644,9 @@ static void vfslog_flush(VfslogVfs *p){
static void put32bits(unsigned char *p, unsigned int v){ static void put32bits(unsigned char *p, unsigned int v){
p[0] = v>>24; p[0] = v>>24;
p[1] = v>>16; p[1] = (unsigned char)(v>>16);
p[2] = v>>8; p[2] = (unsigned char)(v>>8);
p[3] = v; p[3] = (unsigned char)v;
} }
static void vfslog_call( static void vfslog_call(

2
tool/logest.c
View File

@ -147,7 +147,7 @@ int main(int argc, char **argv){
}else if( strcmp(z,"inv")==0 ){ }else if( strcmp(z,"inv")==0 ){
if( n>0 ) a[n-1] = -a[n-1]; if( n>0 ) a[n-1] = -a[n-1];
}else if( z[0]=='^' ){ }else if( z[0]=='^' ){
a[n++] = atoi(z+1); a[n++] = (LogEst)atoi(z+1);
}else if( isInteger(z) ){ }else if( isInteger(z) ){
a[n++] = logEstFromInteger(atoi(z)); a[n++] = logEstFromInteger(atoi(z));
}else if( isFloat(z) && z[0]!='-' ){ }else if( isFloat(z) && z[0]!='-' ){

4
tool/showdb.c
View File

@ -151,7 +151,7 @@ static unsigned char *fileRead(sqlite3_int64 ofst, int nByte){
exit(1); exit(1);
} }
}else{ }else{
lseek(g.dbfd, ofst, SEEK_SET); lseek(g.dbfd, (long)ofst, SEEK_SET);
got = read(g.dbfd, aData, nByte); got = read(g.dbfd, aData, nByte);
if( got>0 && got<nByte ) memset(aData+got, 0, nByte-got); if( got>0 && got<nByte ) memset(aData+got, 0, nByte-got);
} }
@ -1098,7 +1098,7 @@ int main(int argc, char **argv){
sqlite3_free(zPgSz); sqlite3_free(zPgSz);
printf("Pagesize: %d\n", g.pagesize); printf("Pagesize: %d\n", g.pagesize);
g.mxPage = (szFile+g.pagesize-1)/g.pagesize; g.mxPage = (int)((szFile+g.pagesize-1)/g.pagesize);
printf("Available pages: 1..%d\n", g.mxPage); printf("Available pages: 1..%d\n", g.mxPage);
if( nArg==2 ){ if( nArg==2 ){