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

Fix even more harmless compiler warnings.

Browse Source 
FossilOrigin-Name: 1d0e6aa119da8e15d35508f5d75ffc729979da92
This commit is contained in:
mistachkin 2015-12-16 23:30:30 +00:00
parent 8ccdef6be4
commit b9becaa268
8 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.msc
View File

@ -50,7 +50,7 @@ API_ARMOR = 0
!IFNDEF NO_WARN !IFNDEF NO_WARN
!IF $(USE_FULLWARN)!=0 !IF $(USE_FULLWARN)!=0
NO_WARN = -wd4054 -wd4055 -wd4100 -wd4127 -wd4130 -wd4152 -wd4189 -wd4206 NO_WARN = -wd4054 -wd4055 -wd4100 -wd4127 -wd4130 -wd4152 -wd4189 -wd4206
NO_WARN = $(NO_WARN) -wd4210 -wd4232 -wd4244 -wd4305 -wd4306 -wd4702 -wd4706 NO_WARN = $(NO_WARN) -wd4210 -wd4232 -wd4305 -wd4306 -wd4702 -wd4706
!ENDIF !ENDIF
!ENDIF !ENDIF

2
ext/fts5/fts5_expr.c
View File

@ -430,7 +430,7 @@ static int fts5ExprPhraseIsMatch(
} }
if( rc!=SQLITE_OK ) goto ismatch_out; if( rc!=SQLITE_OK ) goto ismatch_out;
sqlite3Fts5PoslistReaderInit(a, n, &aIter[i]); sqlite3Fts5PoslistReaderInit(a, n, &aIter[i]);
aIter[i].bFlag = bFlag; aIter[i].bFlag = (u8)bFlag;
if( aIter[i].bEof ) goto ismatch_out; if( aIter[i].bEof ) goto ismatch_out;
} }

2
ext/fts5/fts5_hash.c
View File

@ -190,7 +190,7 @@ static void fts5HashAddPoslistSize(Fts5HashEntry *p){
assert( p->bDel==0 || p->bDel==1 ); assert( p->bDel==0 || p->bDel==1 );
if( nPos<=127 ){ if( nPos<=127 ){
pPtr[p->iSzPoslist] = nPos; pPtr[p->iSzPoslist] = (u8)nPos;
}else{ }else{
int nByte = sqlite3Fts5GetVarintLen((u32)nPos); int nByte = sqlite3Fts5GetVarintLen((u32)nPos);
memmove(&pPtr[p->iSzPoslist + nByte], &pPtr[p->iSzPoslist + 1], nSz); memmove(&pPtr[p->iSzPoslist + nByte], &pPtr[p->iSzPoslist + 1], nSz);

19
ext/fts5/fts5_index.c
View File

@ -2393,7 +2393,7 @@ static int fts5MultiIterDoCompare(Fts5IndexIter *pIter, int iOut){
} }
} }
pRes->iFirst = iRes; pRes->iFirst = (u16)iRes;
return 0; return 0;
} }
@ -2560,7 +2560,7 @@ static int fts5MultiIterAdvanceRowid(
pIter->iSwitchRowid = pOther->iRowid; pIter->iSwitchRowid = pOther->iRowid;
} }
} }
pRes->iFirst = (pNew - pIter->aSeg); pRes->iFirst = (u16)(pNew - pIter->aSeg);
if( i==1 ) break; if( i==1 ) break;
pOther = &pIter->aSeg[ pIter->aFirst[i ^ 0x0001].iFirst ]; pOther = &pIter->aSeg[ pIter->aFirst[i ^ 0x0001].iFirst ];
@ -2711,7 +2711,7 @@ static void fts5MultiIterNew(
*ppOut = pNew = fts5MultiIterAlloc(p, nSeg); *ppOut = pNew = fts5MultiIterAlloc(p, nSeg);
if( pNew==0 ) return; if( pNew==0 ) return;
pNew->bRev = (0!=(flags & FTS5INDEX_QUERY_DESC)); pNew->bRev = (0!=(flags & FTS5INDEX_QUERY_DESC));
pNew->bSkipEmpty = bSkipEmpty; pNew->bSkipEmpty = (u8)bSkipEmpty;
pNew->pStruct = pStruct; pNew->pStruct = pStruct;
fts5StructureRef(pStruct); fts5StructureRef(pStruct);
@ -3174,7 +3174,7 @@ static void fts5WriteFlushLeaf(Fts5Index *p, Fts5SegWriter *pWriter){
/* Set the szLeaf header field. */ /* Set the szLeaf header field. */
assert( 0==fts5GetU16(&pPage->buf.p[2]) ); assert( 0==fts5GetU16(&pPage->buf.p[2]) );
fts5PutU16(&pPage->buf.p[2], pPage->buf.n); fts5PutU16(&pPage->buf.p[2], (u16)pPage->buf.n);
if( pWriter->bFirstTermInPage ){ if( pWriter->bFirstTermInPage ){
/* No term was written to this page. */ /* No term was written to this page. */
@ -3306,7 +3306,7 @@ static void fts5WriteAppendRowid(
** rowid-pointer in the page-header. Also append a value to the dlidx ** rowid-pointer in the page-header. Also append a value to the dlidx
** buffer, in case a doclist-index is required. */ ** buffer, in case a doclist-index is required. */
if( pWriter->bFirstRowidInPage ){ if( pWriter->bFirstRowidInPage ){
fts5PutU16(pPage->buf.p, pPage->buf.n); fts5PutU16(pPage->buf.p, (u16)pPage->buf.n);
fts5WriteDlidxAppend(p, pWriter, iRowid); fts5WriteDlidxAppend(p, pWriter, iRowid);
} }
@ -3464,7 +3464,7 @@ static void fts5TrimSegments(Fts5Index *p, Fts5IndexIter *pIter){
fts5BufferAppendBlob(&p->rc, &buf, pData->szLeaf-iOff, &pData->p[iOff]); fts5BufferAppendBlob(&p->rc, &buf, pData->szLeaf-iOff, &pData->p[iOff]);
if( p->rc==SQLITE_OK ){ if( p->rc==SQLITE_OK ){
/* Set the szLeaf field */ /* Set the szLeaf field */
fts5PutU16(&buf.p[2], buf.n); fts5PutU16(&buf.p[2], (u16)buf.n);
} }
/* Set up the new page-index array */ /* Set up the new page-index array */
@ -3830,7 +3830,7 @@ static void fts5FlushOneHash(Fts5Index *p){
iRowid += iDelta; iRowid += iDelta;
if( writer.bFirstRowidInPage ){ if( writer.bFirstRowidInPage ){
fts5PutU16(&pBuf->p[0], pBuf->n); /* first rowid on page */ fts5PutU16(&pBuf->p[0], (u16)pBuf->n); /* first rowid on page */
pBuf->n += sqlite3Fts5PutVarint(&pBuf->p[pBuf->n], iRowid); pBuf->n += sqlite3Fts5PutVarint(&pBuf->p[pBuf->n], iRowid);
writer.bFirstRowidInPage = 0; writer.bFirstRowidInPage = 0;
fts5WriteDlidxAppend(p, &writer, iRowid); fts5WriteDlidxAppend(p, &writer, iRowid);
@ -4627,7 +4627,8 @@ int sqlite3Fts5IndexWrite(
int nByte = fts5IndexCharlenToBytelen(pToken, nToken, pConfig->aPrefix[i]); int nByte = fts5IndexCharlenToBytelen(pToken, nToken, pConfig->aPrefix[i]);
if( nByte ){ if( nByte ){
rc = sqlite3Fts5HashWrite(p->pHash, rc = sqlite3Fts5HashWrite(p->pHash,
p->iWriteRowid, iCol, iPos, FTS5_MAIN_PREFIX+i+1, pToken, nByte p->iWriteRowid, iCol, iPos, (char)(FTS5_MAIN_PREFIX+i+1), pToken,
nByte
); );
} }
} }
@ -4677,7 +4678,7 @@ int sqlite3Fts5IndexQuery(
if( iIdx<=pConfig->nPrefix ){ if( iIdx<=pConfig->nPrefix ){
Fts5Structure *pStruct = fts5StructureRead(p); Fts5Structure *pStruct = fts5StructureRead(p);
buf.p[0] = FTS5_MAIN_PREFIX + iIdx; buf.p[0] = (u8)(FTS5_MAIN_PREFIX + iIdx);
if( pStruct ){ if( pStruct ){
fts5MultiIterNew(p, pStruct, 1, flags, buf.p, nToken+1, -1, 0, &pRet); fts5MultiIterNew(p, pStruct, 1, flags, buf.p, nToken+1, -1, 0, &pRet);
fts5StructureRelease(pStruct); fts5StructureRelease(pStruct);

2
ext/fts5/fts5_main.c
View File

@ -588,7 +588,7 @@ static int fts5BestIndexMethod(sqlite3_vtab *pVTab, sqlite3_index_info *pInfo){
struct Constraint *pC = &aConstraint[i]; struct Constraint *pC = &aConstraint[i];
if( pC->iConsIndex>=0 ){ if( pC->iConsIndex>=0 ){
pInfo->aConstraintUsage[pC->iConsIndex].argvIndex = iNext++; pInfo->aConstraintUsage[pC->iConsIndex].argvIndex = iNext++;
pInfo->aConstraintUsage[pC->iConsIndex].omit = pC->omit; pInfo->aConstraintUsage[pC->iConsIndex].omit = (unsigned char)pC->omit;
} }
} }

2
ext/fts5/fts5_tokenize.c
View File

@ -256,7 +256,7 @@ static int fts5UnicodeAddExceptions(
int bToken; int bToken;
READ_UTF8(zCsr, zTerm, iCode); READ_UTF8(zCsr, zTerm, iCode);
if( iCode<128 ){ if( iCode<128 ){
p->aTokenChar[iCode] = bTokenChars; p->aTokenChar[iCode] = (unsigned char)bTokenChars;
}else{ }else{
bToken = sqlite3Fts5UnicodeIsalnum(iCode); bToken = sqlite3Fts5UnicodeIsalnum(iCode);
assert( (bToken==0 || bToken==1) ); assert( (bToken==0 || bToken==1) );

22
manifest
View File

@ -1,8 +1,8 @@
C Fix\ssome\smore\sharmless\scompiler\swarnings. C Fix\seven\smore\sharmless\scompiler\swarnings.
D 2015-12-16T22:06:52.804 D 2015-12-16T23:30:30.339
F Makefile.in 28bcd6149e050dff35d4dcfd97e890cd387a499d F Makefile.in 28bcd6149e050dff35d4dcfd97e890cd387a499d
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc e8fdca1cb89a1b58b5f4d3a130ea9a3d28cb314d F Makefile.msc 5fff077fcc46de7714ed6eebb6159a4c00eab751
F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
F VERSION 8b9d3ac6f1962f94e06ba05462422a544f9c4e36 F VERSION 8b9d3ac6f1962f94e06ba05462422a544f9c4e36
F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@ -101,14 +101,14 @@ F ext/fts5/fts5Int.h acf968e43d57b6b1caf7554d34ec35d6ed3b4fe8
F ext/fts5/fts5_aux.c 1f384972d606375b8fa078319f25ab4b5feb1b35 F ext/fts5/fts5_aux.c 1f384972d606375b8fa078319f25ab4b5feb1b35
F ext/fts5/fts5_buffer.c 1e49512a535045e621246dc7f4f65f3593fa0fc2 F ext/fts5/fts5_buffer.c 1e49512a535045e621246dc7f4f65f3593fa0fc2
F ext/fts5/fts5_config.c 0ee66188609a62342e9f9aeefa3c3e44518a4dd6 F ext/fts5/fts5_config.c 0ee66188609a62342e9f9aeefa3c3e44518a4dd6
F ext/fts5/fts5_expr.c 28b15c9ae296204bc0a2e5cf7a667d840a9d2900 F ext/fts5/fts5_expr.c 80075fa45091bad42100c4a5c4f2efc83e43e3af
F ext/fts5/fts5_hash.c a9d4c1efebc2a91d26ad7ebdfcbf2678ceac405f F ext/fts5/fts5_hash.c 25838d525e97f8662ff3504be94d0bad24f9a37e
F ext/fts5/fts5_index.c b622a0a70f57a96469e6828da2dd70e0872aeb37 F ext/fts5/fts5_index.c 578f46697080f11a1e26cd45a1c039c043a3111d
F ext/fts5/fts5_main.c 7581280ee242785477df67402f2853c66f77d45b F ext/fts5/fts5_main.c ef04699949ab8e42d590ae30188afef7ad58776e
F ext/fts5/fts5_storage.c 9ea3d92178743758b6c54d9fe8836bbbdcc92e3b F ext/fts5/fts5_storage.c 9ea3d92178743758b6c54d9fe8836bbbdcc92e3b
F ext/fts5/fts5_tcl.c 3bf445e66de32137d4693694ff7b1fd6074e32bd F ext/fts5/fts5_tcl.c 3bf445e66de32137d4693694ff7b1fd6074e32bd
F ext/fts5/fts5_test_mi.c e96be827aa8f571031e65e481251dc1981d608bf F ext/fts5/fts5_test_mi.c e96be827aa8f571031e65e481251dc1981d608bf
F ext/fts5/fts5_tokenize.c 12c5d925286491a71bb3dad7c8924ce9cfd18320 F ext/fts5/fts5_tokenize.c 618efe033bceb80c521b1e9ddfd9fee85fb5946e
F ext/fts5/fts5_unicode2.c 78273fbd588d1d9bd0a7e4e0ccc9207348bae33c F ext/fts5/fts5_unicode2.c 78273fbd588d1d9bd0a7e4e0ccc9207348bae33c
F ext/fts5/fts5_varint.c 3f86ce09cab152e3d45490d7586b7ed2e40c13f1 F ext/fts5/fts5_varint.c 3f86ce09cab152e3d45490d7586b7ed2e40c13f1
F ext/fts5/fts5_vocab.c 3742d0abfe8aa8c3cb4a7df56aa38f2e3c3fb1c2 F ext/fts5/fts5_vocab.c 3742d0abfe8aa8c3cb4a7df56aa38f2e3c3fb1c2
@ -1404,7 +1404,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 18a4c0540bf4f02335e9e9def1f2b0d4d784ef08 P 18f531e1cf3c8bb986d912c9c5e3f5698360c93e
R 06de55492a4df78b9664135b3d4b8e56 R d6064250d2ceb34ab73cc0f26f2d0c34
U mistachkin U mistachkin
Z 864a907ebf41c0671e45c9ca5fad89fc Z 5f6aca95d2219a9c4d159221e399907b

2
manifest.uuid
View File

@ -1 +1 @@
18f531e1cf3c8bb986d912c9c5e3f5698360c93e 1d0e6aa119da8e15d35508f5d75ffc729979da92