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

Fix harmless compiler warnings.

Browse Source 
FossilOrigin-Name: 7e60347e21a7473974061965a8d1f2eadde987e2
This commit is contained in:
mistachkin 2014-05-16 23:38:59 +00:00
parent 77a90ce811
commit 02c1e264a9
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ext/fts3/fts3_write.c
View File

@ -3044,7 +3044,7 @@ static void fts3ReadEndBlockField(
*/
static int fts3PromoteSegments(
Fts3Table *p, /* FTS table handle */
int iAbsLevel, /* Absolute level just updated */
sqlite3_int64 iAbsLevel, /* Absolute level just updated */
sqlite3_int64 nByte /* Size of new segment at iAbsLevel */
){
int rc = SQLITE_OK;
@ -3054,7 +3054,7 @@ static int fts3PromoteSegments(
if( rc==SQLITE_OK ){
int bOk = 0;
int iLast = (iAbsLevel/FTS3_SEGDIR_MAXLEVEL + 1) * FTS3_SEGDIR_MAXLEVEL - 1;
i64 iLast = (iAbsLevel/FTS3_SEGDIR_MAXLEVEL + 1) * FTS3_SEGDIR_MAXLEVEL - 1;
i64 nLimit = (nByte*3)/2;
/* Loop through all entries in the %_segdir table corresponding to
@ -3062,8 +3062,8 @@ static int fts3PromoteSegments(
** at least one such segment, and it is possible to determine that all
** such segments are smaller than nLimit bytes in size, they will be
** promoted to level iAbsLevel. */
sqlite3_bind_int(pRange, 1, iAbsLevel+1);
sqlite3_bind_int(pRange, 2, iLast);
sqlite3_bind_int64(pRange, 1, iAbsLevel+1);
sqlite3_bind_int64(pRange, 2, iLast);
while( SQLITE_ROW==sqlite3_step(pRange) ){
i64 nSize, dummy;
fts3ReadEndBlockField(pRange, 2, &dummy, &nSize);
@ -3103,7 +3103,7 @@ static int fts3PromoteSegments(
** setting the "idx" fields as appropriate to keep them in the same
** order. The contents of level -1 (which is never used, except
** transiently here), will be moved back to level iAbsLevel below. */
sqlite3_bind_int(pRange, 1, iAbsLevel);
sqlite3_bind_int64(pRange, 1, iAbsLevel);
while( SQLITE_ROW==sqlite3_step(pRange) ){
sqlite3_bind_int(pUpdate1, 1, iIdx++);
sqlite3_bind_int(pUpdate1, 2, sqlite3_column_int(pRange, 0));
@ -3122,7 +3122,7 @@ static int fts3PromoteSegments(
/* Move level -1 to level iAbsLevel */
if( rc==SQLITE_OK ){
sqlite3_bind_int(pUpdate2, 1, iAbsLevel);
sqlite3_bind_int64(pUpdate2, 1, iAbsLevel);
sqlite3_step(pUpdate2);
rc = sqlite3_reset(pUpdate2);
}

15
manifest
View File

@ -1,5 +1,5 @@
C Work\saround\scompilation\sissue\swith\sMSVC.
D 2014-05-16T23:15:50.277
C Fix\sharmless\scompiler\swarnings.
D 2014-05-16T23:38:59.727
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -96,7 +96,7 @@ F ext/fts3/fts3_tokenizer.h 64c6ef6c5272c51ebe60fc607a896e84288fcbc3
F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
F ext/fts3/fts3_unicode.c 92391b4b4fb043564c6539ea9b8661e3bcba47b9
F ext/fts3/fts3_unicode2.c 0113d3acf13429e6dc38e0647d1bc71211c31a4d
F ext/fts3/fts3_write.c 6681e4855bd24e74e91e2017f3fdc44460449fc1
F ext/fts3/fts3_write.c 9e4e8579ad26cff3ee7743aaf5c3fe937fc441b4
F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
F ext/fts3/tool/fts3view.c 6cfc5b67a5f0e09c0d698f9fd012c784bfaa9197
@ -1172,7 +1172,10 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P a75f1800021d30b712053373440041b7b355a36a
R e44c4f2d8b2a74316856f263d26bcc16
P 9623a29c11e3a90513016ea3306c085d2bf91b62
R 5ded43b85153ff3080cc0993c5b9bd75
T *branch * ftsWarnings
T *sym-ftsWarnings *
T -sym-trunk *
U mistachkin
Z 7ea453b006be693b9823cb9b81301836
Z 3f5cc6ff89fc3bbade4957ecc9f7a199

2
manifest.uuid
View File

@ -1 +1 @@
9623a29c11e3a90513016ea3306c085d2bf91b62
7e60347e21a7473974061965a8d1f2eadde987e2