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

Silence three harmless compiler warnings in vdbesort.c.

Browse Source 
FossilOrigin-Name: a5431c86df442c6e6dfaeae8e8aa62b56d204e97
This commit is contained in:
drh 2012-08-14 19:04:27 +00:00
parent ec73930adc
commit 8b64b3977e
3 changed files with 10 additions and 10 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\san\sassert()\sto\sthe\sbtree\srebalancer\sin\sorder\sto\ssilence\sa\s\nclang/scan-build\swarning.
D 2012-08-14T18:43:39.547
C Silence\sthree\sharmless\scompiler\swarnings\sin\svdbesort.c.
D 2012-08-14T19:04:27.492
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -244,7 +244,7 @@ F src/vdbeapi.c 88ea823bbcb4320f5a6607f39cd7c2d3cc4c26b1
F src/vdbeaux.c dce80038c3c41f2680e5ab4dd0f7e0d8b7ff9071
F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
F src/vdbesort.c bd5ce83f9314bfb632c8c653e9e81db31928a753
F src/vdbesort.c 0dc1b274dcb4d4c8e71b0b2b15261f286caba39b
F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
F src/vtab.c bb8ea3a26608bb1357538a5d2fc72beba6638998
F src/wal.c 9294df6f96aae5909ae1a9b733fd1e1b4736978b
@ -1010,7 +1010,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
P 6954fef006431d153de6e63e362b8d260ebeb1c6
R c7501b04ad663e9c70817cec3b4cff7e
P 6730579cf5c6c74cb293e7237d896d3a3a36b691
R 7ea1e8d09a42f7daed61f69d5f68ea70
U drh
Z aedea036152f85450c01ebb017cff317
Z 6a9fd56c83b0e144f530abdc3bddd4ea

2
manifest.uuid
View File

@ -1 +1 @@
6730579cf5c6c74cb293e7237d896d3a3a36b691
a5431c86df442c6e6dfaeae8e8aa62b56d204e97

6
src/vdbesort.c
View File

@ -195,7 +195,7 @@ static int vdbeSorterIterRead(
int rc; /* sqlite3OsRead() return code */
/* Determine how many bytes of data to read. */
nRead = p->iEof - p->iReadOff;
nRead = (int)(p->iEof - p->iReadOff);
if( nRead>p->nBuffer ) nRead = p->nBuffer;
assert( nRead>0 );
@ -300,7 +300,7 @@ static int vdbeSorterIterNext(
rc = vdbeSorterIterVarint(db, pIter, &nRec);
if( rc==SQLITE_OK ){
pIter->nKey = (int)nRec;
rc = vdbeSorterIterRead(db, pIter, nRec, &pIter->aKey);
rc = vdbeSorterIterRead(db, pIter, (int)nRec, &pIter->aKey);
}
return rc;
@ -343,7 +343,7 @@ static int vdbeSorterIterInit(
if( iBuf ){
int nRead = nBuf - iBuf;
if( (iStart + nRead) > pSorter->iWriteOff ){
nRead = pSorter->iWriteOff - iStart;
nRead = (int)(pSorter->iWriteOff - iStart);
}
rc = sqlite3OsRead(
pSorter->pTemp1, &pIter->aBuffer[iBuf], nRead, iStart