Fix a compiler warning about an unused parameter in the merge-sort code.

FossilOrigin-Name: 6b657ae75035eb10b0ad640998d3c9eadfdffa6e

diff --git a/manifest b/manifest
index fff4ed91322c5f045de9dafce0b726cc11cc62b8..cdcd0fb2ff87645b66e1bf553949f8f045c475d8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improve\sthe\stestability\sof\sthe\smerge-sort\slogic.
-D 2011-09-04T01:11:46.977
+C Fix\sa\scompiler\swarning\sabout\san\sunused\sparameter\sin\sthe\smerge-sort\scode.
+D 2011-09-04T01:27:00.510
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in d314143fa6be24828021d3f583ad37d9afdce505
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -245,7 +245,7 @@ F src/vdbeapi.c 11dc47987abacb76ad016dcf5abc0dc422482a98
 F src/vdbeaux.c e58acbc5ea3823922a0cd8fa21f94f39af51ee88
 F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3
 F src/vdbemem.c 5e6effb96dd53d233361cbfaa3f0a43b9af689e9
-F src/vdbesort.c 4ceadaa20c2a428ea2a5066f6d7d91d7a8118077
+F src/vdbesort.c 14d127565bab1032a20558e6c9ae5f2ec0499111
 F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
 F src/vtab.c 901791a47318c0562cd0c676a2c6ff1bc530e582
 F src/wal.c 3154756177d6219e233d84291d5b05f4e06ff5e9
@@ -961,7 +961,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
-P 4c43e8b2d2c1d8dcba3cd1c3f2ec4e19ab419430
-R 983c9c689f2d53c2e02840decc5ec993
+P b5179baf87aa00ed5cecbdcaa65bee10e112a9e9
+R 19f8e6b3aaa4f6faa3ce68485711b8fa
 U drh
-Z ae9009821df61dee832eb776e8a5bada
+Z c68d8b01f68570c73b0670afe2bb6a90

diff --git a/manifest.uuid b/manifest.uuid
index 1858f041fe86e6222a10240e68fc7717dc22ed25..80fcf402aa76efb52a72552d016d51a974d257e6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b5179baf87aa00ed5cecbdcaa65bee10e112a9e9
\ No newline at end of file
+6b657ae75035eb10b0ad640998d3c9eadfdffa6e
\ No newline at end of file

diff --git a/src/vdbesort.c b/src/vdbesort.c
index 6ce85811a827ab61ee1fd78a9ad0bdc593fa4043..2acba8778dec3f49e0e4c322f0d9487895d8f175 100644 (file)
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -233,7 +233,6 @@ static int vdbeSorterWriteVarint(
 */
 static int vdbeSorterReadVarint(
   sqlite3_file *pFile,            /* File to read from */
-  i64 iEof,                       /* Total number of bytes in file */
   i64 *piOffset,                  /* IN/OUT: Read offset in pFile */
   i64 *piVal                      /* OUT: Value read from file */
 ){
@@ -241,7 +240,6 @@ static int vdbeSorterReadVarint(
   i64 iOff = *piOffset;           /* Offset in file to read from */
   int rc;                         /* Return code */
 
-  assert( iEof>iOff );
   rc = sqlite3OsRead(pFile, aVarint, 9, iOff);
   if( rc==SQLITE_OK ){
     *piOffset += getVarint(aVarint, (u64 *)piVal);
@@ -274,9 +272,8 @@ static int vdbeSorterIterInit(
   if( !pIter->aAlloc ){
     rc = SQLITE_NOMEM;
   }else{
-    i64 iEof = pSorter->iWriteOff;     /* EOF of file pSorter->pTemp1 */
     i64 nByte;                         /* Total size of PMA in bytes */
-    rc = vdbeSorterReadVarint(pSorter->pTemp1, iEof, &pIter->iReadOff, &nByte);
+    rc = vdbeSorterReadVarint(pSorter->pTemp1, &pIter->iReadOff, &nByte);
     *pnByte += nByte;
     pIter->iEof = pIter->iReadOff + nByte;
   }