Fix trivial compiler warnings. (CVS 3295)

FossilOrigin-Name: 3538beace8ece6339fe8aaf40852ce5e5e7da283

diff --git a/manifest b/manifest
index b53f9e7a1c200c2e8dd5e7fef9537a583a4d8070..f0c96af6314c23ea141ef0829edc8c1687b7c2a3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Syntax\sdocumentation\supdates.\s(CVS\s3294)
-D 2006-06-26T10:37:12
+C Fix\strivial\scompiler\swarnings.\s(CVS\s3295)
+D 2006-06-26T11:17:51
 F Makefile.in f839b470345d3cb4b0644068474623fe2464b5d3
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -90,7 +90,7 @@ F src/test_loadext.c 22065d601a18878e5542191001f0eaa5d77c0ed8
 F src/test_md5.c 6c42bc0a3c0b54be34623ff77a0eec32b2fa96e3
 F src/test_schema.c 06042ea462608aecb6f9a95d5649227121093646
 F src/test_server.c a6460daed0b92ecbc2531b6dc73717470e7a648c
-F src/test_tclvar.c c52f67fbe06d32804af2ba9a2d7aadfc15f5910c
+F src/test_tclvar.c 9b7275f058f6a8cc7f61b64e593cd433100725d8
 F src/tokenize.c 7b448440dfd6e984d6bef7ac7fc60f1d26eaf8e7
 F src/trigger.c 0fc40125820409a6274834a6e04ad804d96e2793
 F src/update.c e3f5b7e9e1008e809248ea98bc76844f9a610f7a
@@ -101,10 +101,10 @@ F src/vdbe.c 77679f2e01cb7bbd5087dca96c79116b66119a8f
 F src/vdbe.h 258b5d1c0aaa72192f09ff0568ce42b383f156fa
 F src/vdbeInt.h 37d74cc5651547d76c11682c67286bdf4099b54b
 F src/vdbeapi.c 6af0e7160af260052a7a4500464221a03dada75f
-F src/vdbeaux.c bac87915260c99081ebe824a3b12c3c3f1b2bc73
+F src/vdbeaux.c d957835c822e5b79f1adc1b22cf959e116414bbd
 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
 F src/vdbemem.c 5f0afe3b92bb2c037f8d5d697f7c151fa50783a3
-F src/vtab.c 1eaa23c1a52c96927076c196c5b19752efd02111
+F src/vtab.c 4751954e26e9caa6ce3ea5ad9468bd34f07d1de7
 F src/where.c 8ba6fa490be2d39ff8208a387816d3c61172a400
 F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -373,7 +373,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P f357efb373b8631dbe4455530d060020b070bea2
-R 9160521c9071a296cd2536254213d47d
-U drh
-Z 4abb52d1b53299f97247886cbf01198d
+P df601a7b374cb6ec21a2e91abf17af4fed404393
+R d69c8936d3b462628cdb2178258952aa
+U danielk1977
+Z 61efe5f570c81872f1fcd01cde3929c6

diff --git a/manifest.uuid b/manifest.uuid
index 56cff9e84ab668caefe8f533145acdaed611e355..ff9eecd639b75b303c74fa91e65c2ec7ca3a097a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-df601a7b374cb6ec21a2e91abf17af4fed404393
\ No newline at end of file
+3538beace8ece6339fe8aaf40852ce5e5e7da283
\ No newline at end of file

diff --git a/src/test_tclvar.c b/src/test_tclvar.c
index daa86e780776a1e9bf7cc9efcda7032b299ef85d..d92100a282586de32f38d2a17de171970fd05483 100644 (file)
--- a/src/test_tclvar.c
+++ b/src/test_tclvar.c
@@ -16,7 +16,7 @@
 ** The emphasis of this file is a virtual table that provides
 ** access to TCL variables.
 **
-** $Id: test_tclvar.c,v 1.3 2006/06/15 04:28:13 danielk1977 Exp $
+** $Id: test_tclvar.c,v 1.4 2006/06/26 11:17:51 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -136,6 +136,7 @@ static sqlite3_module tclvarModule = {
   tclvarClose,                 /* xClose - close a cursor */
   tclvarFilter,                /* xFilter - configure scan constraints */
   tclvarNext,                  /* xNext - advance a cursor */
+  0,                           /* xEof - check for end of scan */
   tclvarColumn,                /* xColumn - read data */
   tclvarRowid                  /* xRowid - read data */
 };

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index ca88ec9ee939c26d6c35fc607086c271f697bc37..b95d690f7d256f9ced7c1f143b2a1b5f85febbd2 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -850,7 +850,6 @@ void sqlite3VdbeFreeCursor(Vdbe *p, Cursor *pCx){
 #ifndef SQLITE_OMIT_VIRTUALTABLE
   if( pCx->pVtabCursor ){
     sqlite3_vtab_cursor *pVtabCursor = pCx->pVtabCursor;
-    sqlite3_vtab *pVtab = pVtabCursor->pVtab;
     const sqlite3_module *pModule = pCx->pModule;
     p->inVtabMethod = 1;
     pModule->xClose(pVtabCursor);

diff --git a/src/vtab.c b/src/vtab.c
index 0e4447934dcbce4198bd98a4c203f371834c1d7b..f687a251f1bed169076f7d8783ab35021b9d8cc8 100644 (file)
--- a/src/vtab.c
+++ b/src/vtab.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains code used to help implement virtual tables.
 **
-** $Id: vtab.c,v 1.24 2006/06/24 09:34:23 danielk1977 Exp $
+** $Id: vtab.c,v 1.25 2006/06/26 11:17:51 danielk1977 Exp $
 */
 #ifndef SQLITE_OMIT_VIRTUALTABLE
 #include "sqliteInt.h"
@@ -139,7 +139,7 @@ void sqlite3VtabBeginParse(
 */
 static void addArgumentToVtab(Parse *pParse){
   if( pParse->sArg.z && pParse->pNewTable ){
-    char *z = pParse->sArg.z;
+    const char *z = pParse->sArg.z;
     int n = pParse->sArg.n;
     addModuleArgument(pParse->pNewTable, sqliteStrNDup(z, n));
   }