Fix compiler warnings. (CVS 6117)

FossilOrigin-Name: da770a8dff183b28aca287cafb9c8b82b98ea968

diff --git a/manifest b/manifest
index 44619fdb04929e4b8b58351c1a755de55bdee991..9d7b416106a22f7903a46e009439753c24a972d0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssome\ssavepoint\srelated\stest\scases\sand\sfix\sa\sfew\sproblems.\s(CVS\s6116)
-D 2009-01-06T13:40:08
+C Fix\scompiler\swarnings.\s(CVS\s6117)
+D 2009-01-06T14:19:37
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 05461a9b5803d5ad10c79f989801e9fd2cc3e592
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -143,7 +143,7 @@ F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
 F src/os_unix.c e6eacc7ec735ded605fefcbaf250058baa8feb12
 F src/os_win.c 496e3ceb499aedc63622a89ef76f7af2dd902709
 F src/pager.c 9c9bc48765cb8d6c4445d3628bed52a0e0af762c
-F src/pager.h 75396879910768a0af03a4af8413e798d84c096f
+F src/pager.h 0793c5e4faed6c278037eb22b2434b318687d615
 F src/parse.y 4d0e33a702dc3ea7b69d8ae1914b3fbd32e46057
 F src/pcache.c 16dc8da6e6ba6250f8dfd9ee46036db1cbceedc6
 F src/pcache.h f20c3e82dd6da622c3fe296170cb1801f9a2d75a
@@ -207,7 +207,7 @@ F src/vdbeblob.c b0dcebfafedcf9c0addc7901ad98f6f986c08935
 F src/vdbemem.c 19f94b504d3da44b31aef200fa6c8e07862de2e8
 F src/vtab.c e39e011d7443a8d574b1b9cde207a35522e6df43
 F src/walker.c 488c2660e13224ff70c0c82761118efb547f8f0d
-F src/where.c 0b2eb969d1f0b7baf02f0a789243ab1eb0d2a541
+F src/where.c ad9d49f77b9c70adc38cf1b829c870f30a9afe04
 F tclinstaller.tcl 4356d9d94d2b5ed5e68f9f0c80c4df3048dd7617
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 597662c5d777a122f9a3df0047ea5c5bd383a911
@@ -692,7 +692,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P c2482d8877a5f9e387b288377e410ae1b8267f3c
-R 99d979f1a5afc6b0e70e7af446024426
-U danielk1977
-Z 76e17593f6a27ee09beef4dfa4478a92
+P 8c62ea4fded2251e9daf16f2a050f94359299d76
+R d34da009576dbfa85fca59c19029124d
+U drh
+Z 0264d4c499d8f99603da773992f1f3bf

diff --git a/manifest.uuid b/manifest.uuid
index 00fa21adca5c7ea90fc768bd2a4444d6acfad6c4..652edb289d877c0e61d94474e0266d9ea70919ce 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8c62ea4fded2251e9daf16f2a050f94359299d76
\ No newline at end of file
+da770a8dff183b28aca287cafb9c8b82b98ea968
\ No newline at end of file

diff --git a/src/pager.h b/src/pager.h
index 329515918aeef529bd284de5ac807232c8dacd54..8b7df843c476b9668c2d5b68a5a42990da5f4c0d 100644 (file)
--- a/src/pager.h
+++ b/src/pager.h
@@ -13,7 +13,7 @@
 ** subsystem.  The page cache subsystem reads and writes a file a page
 ** at a time and provides a journal for rollback.
 **
-** @(#) $Id: pager.h,v 1.91 2009/01/02 18:10:42 drh Exp $
+** @(#) $Id: pager.h,v 1.92 2009/01/06 14:19:37 drh Exp $
 */
 
 #ifndef _PAGER_H_
@@ -94,9 +94,6 @@ int sqlite3PagerCommitPhaseOne(Pager*,const char *zMaster, int);
 int sqlite3PagerCommitPhaseTwo(Pager*);
 int sqlite3PagerRollback(Pager*);
 u8 sqlite3PagerIsreadonly(Pager*);
-int sqlite3PagerStmtBegin(Pager*);
-int sqlite3PagerStmtCommit(Pager*);
-int sqlite3PagerStmtRollback(Pager*);
 void sqlite3PagerDontRollback(DbPage*);
 int sqlite3PagerDontWrite(DbPage*);
 int sqlite3PagerRefcount(Pager*);

diff --git a/src/where.c b/src/where.c
index 4b6b3104650b77c6c5eaf203144e4bc3b7979a34..ca513be0623efc072af5f4b8f53b31459fc23d4d 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -16,7 +16,7 @@
 ** so is applicable.  Because this module is responsible for selecting
 ** indices, you might also think of this module as the "query optimizer".
 **
-** $Id: where.c,v 1.356 2009/01/06 00:08:02 drh Exp $
+** $Id: where.c,v 1.357 2009/01/06 14:19:37 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -1847,7 +1847,7 @@ static void bestIndex(
       WhereTerm *pOrTerm;
       int j;
       double rTotal = 0;
-      double nRow = 0;
+      nRow = 0;
       for(j=0, pOrTerm=pOrWC->a; j<pOrWC->nTerm; j++, pOrTerm++){
         WhereCost sTermCost;
         WHERETRACE(("... Multi-index OR testing for term %d of %d....\n", j,i));
@@ -1903,7 +1903,6 @@ static void bestIndex(
     pProbe = pSrc->pIndex;
   }
   for(; pProbe; pProbe=(pSrc->pIndex ? 0 : pProbe->pNext)){
-    int i;                       /* Loop counter */
     double inMultiplier = 1;
 
     WHERETRACE(("... index %s:\n", pProbe->zName));
@@ -2682,7 +2681,6 @@ static Bitmask codeOneLoopStart(
     */
     int regOrRowset;       /* Register holding the RowSet object */
     int regNextRowid;      /* Register holding next rowid */
-    WhereTerm *pTerm;      /* The complete OR-clause */
     WhereClause *pOrWc;    /* The OR-clause broken out into subterms */
     WhereTerm *pOrTerm;    /* A single subterm within the OR-clause */
     SrcList oneTab;        /* Shortened table list */