Fix comment in vdbeapi.c. Remove unused structure definition from func.c. (CVS 2629)

FossilOrigin-Name: 51a381345db45967567dd0a18905d352bf1081e0

diff --git a/manifest b/manifest
index acf289f1f0c37a60655282c82b545c15c205e899..986909bcbd12d4ced9dc6ba4278c81103a2585cc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\swords\s"statically\slinked"\sfrom\sthe\sdescription\sof\sthe\sshell\son\nthe\sdownload\spage.\s\sTicket\s#1391.\s(CVS\s2628)
-D 2005-08-27T13:11:21
+C Fix\scomment\sin\svdbeapi.c.\s\sRemove\sunused\sstructure\sdefinition\sfrom\sfunc.c.\s(CVS\s2629)
+D 2005-08-27T13:16:33
 F Makefile.in 12784cdce5ffc8dfb707300c34e4f1eb3b8a14f1
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -41,7 +41,7 @@ F src/date.c 7444b0900a28da77e57e3337a636873cff0ae940
 F src/delete.c be1fc25c9e109cd8cbab42a43ee696263da7c04b
 F src/experimental.c 50c1e3b34f752f4ac10c36f287db095c2b61766d
 F src/expr.c 1916cb22c585e1aa0d1e25a8efe7497004b6ae32
-F src/func.c 5b12db87f0bc7d978eaf87c7a348ada5d1934da4
+F src/func.c 34085cf518928c7aa61c2d5029e25b0326108887
 F src/hash.c 2b1b13f7400e179631c83a1be0c664608c8f021f
 F src/hash.h 1b0c445e1c89ff2aaad9b4605ba61375af001e84
 F src/insert.c 484c73bc1309f283a31baa0e114f3ee980536397
@@ -83,7 +83,7 @@ F src/vacuum.c 829d9e1a6d7c094b80e0899686670932eafd768c
 F src/vdbe.c 69f33e22c7d0a64b23fbb69e6da95a1bb6869032
 F src/vdbe.h 3b29a9af6c7a64ed692bef1fc5f61338f40d2f67
 F src/vdbeInt.h 89a7fa5dc35477bd30ea27b0bf38e9e5c2903812
-F src/vdbeapi.c 7790e9f8da2dde29510a196d1e41ff53da7eb8a8
+F src/vdbeapi.c f1adebb5e3fe4724ed0e1a82c4a61809d7e15e9e
 F src/vdbeaux.c 874624698fad54a59c6a0bcccea9d5aaa8655ab6
 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
 F src/vdbemem.c 4732fd4d1a75dc38549493d7f9a81d02bf7c59b5
@@ -298,7 +298,7 @@ F www/tclsqlite.tcl 3df553505b6efcad08f91e9b975deb2e6c9bb955
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P d0691fed4344869830ea9ec2390bc1e7c1679844
-R a7761c388bd485c6049515a7c1012a50
+P ecb9604457d5ab6bcd81b582cc4dd85a8f371b86
+R bbe29a50d2da25ad59c230f05a2f2f4d
 U drh
-Z cf6d93c877c9cd55d2b05da36478ac1b
+Z 787ff796a6044c29e432aa2a25d2214c

diff --git a/manifest.uuid b/manifest.uuid
index 30c625726b02cfee03811357ce3cc20774fd68c5..a95cd4052a712fb056f5bbd60777e3dcb89d7fd4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ecb9604457d5ab6bcd81b582cc4dd85a8f371b86
\ No newline at end of file
+51a381345db45967567dd0a18905d352bf1081e0
\ No newline at end of file

diff --git a/src/func.c b/src/func.c
index 43ee4589953b366ee3489cd47c9d3f0dcb979a54..c7baaa086c2956361659284a852e0b3c8beba0c3 100644 (file)
--- a/src/func.c
+++ b/src/func.c
@@ -16,7 +16,7 @@
 ** sqliteRegisterBuildinFunctions() found at the bottom of the file.
 ** All other code has file scope.
 **
-** $Id: func.c,v 1.104 2005/08/14 01:20:38 drh Exp $
+** $Id: func.c,v 1.105 2005/08/27 13:16:33 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -882,16 +882,6 @@ static void countFinalize(sqlite3_context *context){
   sqlite3_result_int(context, p ? p->n : 0);
 }
 
-/*
-** This function tracks state information for the min() and max()
-** aggregate functions.
-*/
-typedef struct MinMaxCtx MinMaxCtx;
-struct MinMaxCtx {
-  char *z;         /* The best so far */
-  char zBuf[28];   /* Space that can be used for storage */
-};
-
 /*
 ** Routines to implement min() and max() aggregate functions.
 */

diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 776e2276168ad86cd6b9cf9638bc356c796eb745..dfe8f12c418e6df091ce554317fe89f857f623c3 100644 (file)
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -230,10 +230,6 @@ void *sqlite3_user_data(sqlite3_context *p){
 ** Allocate or return the aggregate context for a user function.  A new
 ** context is allocated on the first call.  Subsequent calls return the
 ** same context that was returned on prior calls.
-**
-** This routine is defined here in vdbe.c because it depends on knowing
-** the internals of the sqlite3_context structure which is only defined in
-** this source file.
 */
 void *sqlite3_aggregate_context(sqlite3_context *p, int nByte){
   assert( p && p->pFunc && p->pFunc->xStep );