Remove unused parameters from internal routines in vdbesort.c. This is

an additional simplification made possible by recent optimizations.

FossilOrigin-Name: a1f3aeeb0988c848d40ce8f6da6e902935a997e2

diff --git a/manifest b/manifest
index dbc14153318443092c0c9c498cb3315db2f58c1c..81dc60c3f86967955cc259e5fee0d3796f5970f8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\scode\sfrom\svdbesort.c\sthat\swas\smade\sunreachable\sby\sthe\srecent\nsqlite3VdbeRecordUnpack()\soptimizations.
-D 2011-09-14T13:23:21.875
+C Remove\sunused\sparameters\sfrom\sinternal\sroutines\sin\svdbesort.c.\s\sThis\sis\nan\sadditional\ssimplification\smade\spossible\sby\srecent\soptimizations.
+D 2011-09-14T13:41:40.399
 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 079d37d4afac8359b2bbbf4af9876be04cc857b8
 F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3
 F src/vdbemem.c 5e6effb96dd53d233361cbfaa3f0a43b9af689e9
-F src/vdbesort.c df1953a4929c4e82603d67ee7e5f6703f8a9135e
+F src/vdbesort.c 8dd9c1acd9b0ff4ed384b577313dd95e9f291be6
 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 07788c0f7f3740c1c280f6ce4dc68401c30bae6e
-R 10acdf81d291f1b22f3bc7924f505649
+P 607aba6cd7020973200fa376cf8df55360165266
+R 173f2a8d2f899d9b1ff888e1ca0ea270
 U drh
-Z eeb8c9d9c6395f39be328ccc4c54c823
+Z 7f74dee362473d34447e67caba8f3e87

diff --git a/manifest.uuid b/manifest.uuid
index aa441de2acee312fa2d2b1001aad74a7663f2cc8..7f6ae00cf539ba787ec7cc243cf3df9a5843fc2b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-607aba6cd7020973200fa376cf8df55360165266
\ No newline at end of file
+a1f3aeeb0988c848d40ce8f6da6e902935a997e2
\ No newline at end of file

diff --git a/src/vdbesort.c b/src/vdbesort.c
index 0a8ec81220414075471da1b5c80a8f4aba40b991..671c50e66ae660f08120dda9d4fef73adcf821d8 100644 (file)
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -460,7 +460,6 @@ static int vdbeSorterOpenTempFile(sqlite3 *db, sqlite3_file **ppFile){
 ** Set *ppOut to the head of the new list.
 */
 static void vdbeSorterMerge(
-  sqlite3 *db,                    /* Database handle */
   VdbeCursor *pCsr,               /* For pKeyInfo */
   SorterRecord *p1,               /* First list to merge */
   SorterRecord *p2,               /* Second list to merge */
@@ -495,7 +494,7 @@ static void vdbeSorterMerge(
 ** if successful, or an SQLite error code (i.e. SQLITE_NOMEM) if an error
 ** occurs.
 */
-static int vdbeSorterSort(sqlite3 *db, VdbeCursor *pCsr){
+static int vdbeSorterSort(VdbeCursor *pCsr){
   int i;
   SorterRecord **aSlot;
   SorterRecord *p;
@@ -511,7 +510,7 @@ static int vdbeSorterSort(sqlite3 *db, VdbeCursor *pCsr){
     SorterRecord *pNext = p->pNext;
     p->pNext = 0;
     for(i=0; aSlot[i]; i++){
-      vdbeSorterMerge(db, pCsr, p, aSlot[i], &p);
+      vdbeSorterMerge(pCsr, p, aSlot[i], &p);
       aSlot[i] = 0;
     }
     aSlot[i] = p;
@@ -520,7 +519,7 @@ static int vdbeSorterSort(sqlite3 *db, VdbeCursor *pCsr){
 
   p = 0;
   for(i=0; i<64; i++){
-    vdbeSorterMerge(db, pCsr, p, aSlot[i], &p);
+    vdbeSorterMerge(pCsr, p, aSlot[i], &p);
   }
   pSorter->pRecord = p;
 
@@ -551,7 +550,7 @@ static int vdbeSorterListToPMA(sqlite3 *db, VdbeCursor *pCsr){
     return rc;
   }
 
-  rc = vdbeSorterSort(db, pCsr);
+  rc = vdbeSorterSort(pCsr);
 
   /* If the first temporary PMA file has not been opened, open it now. */
   if( rc==SQLITE_OK && pSorter->pTemp1==0 ){
@@ -698,7 +697,7 @@ int sqlite3VdbeSorterRewind(sqlite3 *db, VdbeCursor *pCsr, int *pbEof){
   if( pSorter->nPMA==0 ){
     *pbEof = !pSorter->pRecord;
     assert( pSorter->aTree==0 );
-    return vdbeSorterSort(db, pCsr);
+    return vdbeSorterSort(pCsr);
   }
 
   /* Write the current b-tree to a PMA. Close the b-tree cursor. */