Remove the unused sqlite3_context.isStep element. (CVS 2156)

FossilOrigin-Name: 7b20f2b71f679e72b6cb3b78ccb31b4e7c4bd48b

diff --git a/manifest b/manifest
index 331eac8b8e6c84719f40cb444eeefcd6bc0c33bb..8e777fa3a89039f1bde9f182f1111f5dccdff993 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Updates\sto\sAPI\sdocumentation\sand\scomments\sin\ssqlite3.h.\s(CVS\s2155)
-D 2004-12-07T02:14:51
+C Remove\sthe\sunused\ssqlite3_context.isStep\selement.\s(CVS\s2156)
+D 2004-12-07T12:29:18
 F Makefile.in da09f379b80c8cd78d78abaa0f32ca90a124e884
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -31,7 +31,7 @@ F src/attach.c e49d09dad9f5f9fb10b4b0c1be5a70ae4c45e689
 F src/auth.c 3b81f2a42f48a62c2c9c9b0eda31a157c681edea
 F src/btree.c fa113d624d38bcb36700a0244b47f39d57d34efb
 F src/btree.h 861e40b759a195ba63819740e484390012cf81ab
-F src/build.c aa7975d778491ab144ae3921a7791cd51a733e8b
+F src/build.c 306e49e1f6f19741a40c1bbc23140027aa4f8cc9
 F src/cursor.c f883813759742068890b1f699335872bfa8fdf41
 F src/date.c 65536e7ea04fdde6e0551264fca15966966e171f
 F src/delete.c 9083377a4c5b152b4466021592f32e3e8a3819e3
@@ -76,11 +76,11 @@ F src/update.c d79d1936c5603b3ce2ee22557618b6baad67efba
 F src/utf.c e45ce11be6922408cd381561721f6cca7d3b992a
 F src/util.c 4a8db4e97a3cfda12ad8dda3e77dd2d00ad1de5e
 F src/vacuum.c 705256e1111521fa04f0029de7f1667bc131d015
-F src/vdbe.c b6caad985b7804b8158ab01b2021f1890570b7f3
+F src/vdbe.c fb9260cd92556d1a32538af1b1b761232337aff1
 F src/vdbe.h 067ca8d6750ba4f69a50284765e5883dee860181
-F src/vdbeInt.h 6017100adff362b8dfa37a69e3f1431f084bfa5b
+F src/vdbeInt.h 0f74561e629af86172de7cdf0ecaea014c51696c
 F src/vdbeapi.c 74be7f96c0a1ac275661f8b32276ac521d9ce37c
-F src/vdbeaux.c dc06bbb8511d07f8d45ed2ea760f35f0736a690c
+F src/vdbeaux.c a7c4c90786e2633b38f2d89f3dc49aed747454e4
 F src/vdbemem.c 5876c8abf4374fef671f4fd8dc333ef3fc95a2f0
 F src/where.c f9d3b6f2243a0eb9065fa4c465fe0831a64b7db7
 F tclinstaller.tcl 36478c3bbfc5b93ceac42d94e3c736937b808432
@@ -262,7 +262,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl fdacb0ba2d39831e8a6240d05a490026ad4c4e4c
-P f7415a0d6433980ff6c25cf2238f5e9881c38873
-R 3e773cbf7b112fee9ee1223a2128d596
+P 46584348f3cc10c0c6e9ba42110a6c03caf1497e
+R 993dd8bd273e62b479ee8b37d9936fc4
 U drh
-Z 5d04f9ad0daf17e058e901e2fe7ea384
+Z 96d5b22a935bba53de9bbed3780ad692

diff --git a/manifest.uuid b/manifest.uuid
index ee438f0152d19a1e6146bcba905d87e0c88b82c9..df7ec2d0f42b63b09c6f9b49e7dd1da3252b382a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-46584348f3cc10c0c6e9ba42110a6c03caf1497e
\ No newline at end of file
+7b20f2b71f679e72b6cb3b78ccb31b4e7c4bd48b
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index beff06c986f653bb37eeb1b671105a4020a58cdc..6e982915bb91ea0e17496a7e8c17c79dc9f7af3b 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -22,7 +22,7 @@
 **     COMMIT
 **     ROLLBACK
 **
-** $Id: build.c,v 1.288 2004/11/23 16:31:17 danielk1977 Exp $
+** $Id: build.c,v 1.289 2004/12/07 12:29:18 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -1702,7 +1702,7 @@ static void destroyRootPage(Parse *pParse, int iTable, int iDb){
 #ifndef SQLITE_OMIT_AUTOVACUUM
   /* OP_Destroy pushes an integer onto the stack. If this integer
   ** is non-zero, then it is the root page number of a table moved to
-  ** location iTable. The following code modifis the sqlite_master table to
+  ** location iTable. The following code modifies the sqlite_master table to
   ** reflect this.
   **
   ** The "#0" in the SQL is a special constant that means whatever value

diff --git a/src/vdbe.c b/src/vdbe.c
index dc4963eafa7ca40c104b90a5b3e3f6cdca05ec39..48e09089af59ddb6cc0f63fa63aa2ea0c599f236 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.431 2004/11/23 01:47:30 drh Exp $
+** $Id: vdbe.c,v 1.432 2004/12/07 12:29:18 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -380,7 +380,7 @@ void sqlite3VdbeMemPrettyPrint(Mem *pMem, char *zBuf, int nBuf){
 #ifdef VDBE_PROFILE
 /*
 ** The following routine only works on pentium-class processors.
-** It uses the RDTSC opcode to read cycle count value out of the
+** It uses the RDTSC opcode to read the cycle count value out of the
 ** processor and returns that value.  This can be used for high-res
 ** profiling.
 */
@@ -1156,7 +1156,6 @@ case OP_Function: {
   ctx.s.z = 0;
   ctx.s.xDel = 0;
   ctx.isError = 0;
-  ctx.isStep = 0;
   if( ctx.pFunc->needCollSeq ){
     assert( pOp>p->aOp );
     assert( pOp[-1].p3type==P3_COLLSEQ );
@@ -3644,7 +3643,7 @@ case OP_IdxIsNull: {
 ** value of the root page that moved - its value before the move occurred -
 ** is pushed onto the stack.  If no page movement was required (because
 ** the table being dropped was already the last one in the database) then
-** a zero is pushed onto the stack.  If AUTOVACUUM is disabled at 
+** a zero is pushed onto the stack.  If AUTOVACUUM is disabled
 ** then a zero is pushed onto the stack.
 **
 ** See also: Clear
@@ -4241,7 +4240,6 @@ case OP_AggFunc: {
   ctx.pAgg = pMem->z;
   ctx.cnt = ++pMem->i;
   ctx.isError = 0;
-  ctx.isStep = 1;
   ctx.pColl = 0;
   if( ctx.pFunc->needCollSeq ){
     assert( pOp>p->aOp );
@@ -4404,7 +4402,6 @@ case OP_AggNext: {
       ctx.s.z = pMem->zShort;
       ctx.pAgg = (void*)pMem->z;
       ctx.cnt = pMem->i;
-      ctx.isStep = 0;
       ctx.pFunc = pFunc;
       pFunc->xFinalize(&ctx);
       pMem->z = ctx.pAgg;

diff --git a/src/vdbeInt.h b/src/vdbeInt.h
index a929cb95e1a3673b23f82b1f6a8056740776b595..86e601f04a30dbc681741aee7e9d037df7b47ef4 100644 (file)
--- a/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@ -220,7 +220,6 @@ struct sqlite3_context {
   Mem s;            /* The return value is stored here */
   void *pAgg;       /* Aggregate context */
   u8 isError;       /* Set to true for an error */
-  u8 isStep;        /* Current in the step function */
   int cnt;          /* Number of times that the step function has been called */
   CollSeq *pColl;
 };

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 0cf7d8bb9a42900a94635bf4cbe08d02160c3f15..2714b12b3a4f8a02ed2ace95b230119cbef31451 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -699,9 +699,8 @@ void freeAggElem(AggElem *pElem, Agg *pAgg){
       ctx.s.flags = MEM_Null;
       ctx.pAgg = pMem->z;
       ctx.cnt = pMem->i;
-      ctx.isStep = 0;
       ctx.isError = 0;
-      (*pAgg->apFunc[i]->xFinalize)(&ctx);
+      (*ctx.pFunc->xFinalize)(&ctx);
       pMem->z = ctx.pAgg;
       if( pMem->z!=0 && pMem->z!=pMem->zShort ){
         sqliteFree(pMem->z);