Trivial modifications to prevent compiler warnings. (CVS 1608)

FossilOrigin-Name: b3d5ad6f7832d46e34e99e4a1cb7e47c88f207a4

diff --git a/manifest b/manifest
index 6d85d281405b517c99693afb36cce1b38839bb6f..41d445f8099048c0ff115238526da5a4d4392428 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Trivial\smodifications\sto\sprevent\scompiler\swarnings.\s(CVS\s1607)
-D 2004-06-16T12:02:43
+C Trivial\smodifications\sto\sprevent\scompiler\swarnings.\s(CVS\s1608)
+D 2004-06-16T12:02:47
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -71,13 +71,13 @@ F src/update.c f9a03233577e0c3d57234d1957963875fc941da2
 F src/utf.c e16737b3fc4201bf7ce9bd8ced5250596aa31b76
 F src/util.c 6e93dad9a17b34f37fc270ba871b224240168bf0
 F src/vacuum.c f9561c8095407a970af4e6a304b77c4083433d3e
-F src/vdbe.c fc94f84e43a2f2d27b85a79ce7bea9ffbccc9954
+F src/vdbe.c 35ae18345a8c35b17a37226cf868a99623288139
 F src/vdbe.h 46f74444a213129bc4b5ce40124dd8ed613b0cde
 F src/vdbeInt.h 4e636b1b6c18d1d85b085fe0e5a19d45ad85f382
 F src/vdbeapi.c ee350b552fc4c1c695b760f914f69e9c5556e829
 F src/vdbeaux.c dc0e7d3bdf3b6f322448b4bee29fe5bec656b4d4
 F src/vdbemem.c 1e7df5ed53bc05433c7d3fb28899cf2c82bd16ac
-F src/where.c 7fee7aeb9278f27324f228c55ab453b5f183b486
+F src/where.c 4955f34f7b46c9ca5c4e50e2db440f5e356f04dd
 F test/all.test 569a92a8ee88f5300c057cc4a8f50fbbc69a3242
 F test/attach.test aed659e52635662bcd5069599aaca823533edf5a
 F test/attach2.test 579d6cb94cb944e0d87a2bf8d6696e2036847e6a
@@ -224,7 +224,7 @@ F www/support.tcl 1801397edd271cc39a2aadd54e701184b5181248
 F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 6001c5e1ced08096bb404e72ff533b7edcc896ec
-R 926ee1c1181221a8e533445e06805bda
+P 7974c9a6f5ed86f02176376d99d909c43a4ae455
+R 85df656fc4f4b3a44d71d211647234ae
 U danielk1977
-Z 8d48f23f609d3721dcaa35ec5bb8ceaf
+Z fb4d7815b96c96ab66b53516ec35fdb2

diff --git a/manifest.uuid b/manifest.uuid
index fb18517711d4c566a63d3de3a105158de9b3ef05..f01d197feb437c437b93a492d586ea7f73051410 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7974c9a6f5ed86f02176376d99d909c43a4ae455
\ No newline at end of file
+b3d5ad6f7832d46e34e99e4a1cb7e47c88f207a4
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 527e949abbe6e66c82b9df672ffadecd2d7af68f..742dec22c61883c70246e9104ce7e6f6fca48474 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.376 2004/06/16 10:39:52 danielk1977 Exp $
+** $Id: vdbe.c,v 1.377 2004/06/16 12:02:54 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -1934,6 +1934,7 @@ case OP_Column: {
     assert( pCnt>=p->aStack );
     assert( pCnt->flags & MEM_Int );
     nField = pCnt->i;
+    pCrsr = 0;
   }else if( (pC = p->apCsr[p1])->pCursor!=0 ){
     /* The record is stored in a B-Tree */
     sqlite3VdbeCursorMoveto(pC);
@@ -1959,8 +1960,12 @@ case OP_Column: {
     pC->cacheValid = 0;
     assert( payloadSize==0 || zRec!=0 );
     nField = pC->nField;
+    pCrsr = 0;
   }else{
+    zRec = 0;
     payloadSize = 0;
+    pCrsr = 0;
+    nField = 0;
   }
 
   /* If payloadSize is 0, then just push a NULL onto the stack. */
@@ -2200,7 +2205,7 @@ case OP_MakeRecord: {
   unsigned char *zCsr;
   char *zAffinity;
   Mem *pRec;
-  Mem *pRowid;
+  Mem *pRowid = 0;
   int nData = 0;     /* Number of bytes of data space */
   int nHdr = 0;      /* Number of bytes of header space */
   int nByte = 0;     /* Space required for this record */
@@ -3058,7 +3063,7 @@ case OP_NewRecno: {
     ** larger than the previous rowid.  This has been shown experimentally
     ** to double the speed of the COPY operation.
     */
-    int res, rx, cnt;
+    int res, rx=SQLITE_OK, cnt;
     i64 x;
     cnt = 0;
     assert( (sqlite3BtreeFlags(pC->pCursor) & BTREE_INTKEY)!=0 );

diff --git a/src/where.c b/src/where.c
index bdd08e9fca9048c0562a201c4f06b5ce8c53bdf9..40ba9fb8c9f0f4dc71836c150c269af9bf8ee458 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -12,7 +12,7 @@
 ** This module contains C code that generates VDBE code used to process
 ** the WHERE clause of SQL statements.
 **
-** $Id: where.c,v 1.105 2004/06/14 08:26:35 danielk1977 Exp $
+** $Id: where.c,v 1.106 2004/06/16 12:03:10 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -368,7 +368,7 @@ WhereInfo *sqlite3WhereBegin(
   int brk, cont = 0;         /* Addresses used during code generation */
   int nExpr;           /* Number of subexpressions in the WHERE clause */
   int loopMask;        /* One bit set for each outer loop */
-  int haveKey;         /* True if KEY is on the stack */
+  int haveKey = 0;     /* True if KEY is on the stack */
   ExprMaskSet maskSet; /* The expression mask set */
   int iDirectEq[32];   /* Term of the form ROWID==X for the N-th table */
   int iDirectLt[32];   /* Term of the form ROWID<X or ROWID<=X */
@@ -944,7 +944,7 @@ WhereInfo *sqlite3WhereBegin(
       int score = pLevel->score;
       int nEqColumn = score/8;
       int start;
-      int leFlag, geFlag;
+      int leFlag=0, geFlag=0;
       int testOp;
 
       /* Evaluate the equality constraints