More compiler warnings fixed - or in some cases comments are added to explain

that the compiler is wrong. (CVS 2984)

FossilOrigin-Name: 507653a98cbd096f836a977408e373640c7cdb8f

diff --git a/manifest b/manifest
index f11985b54a7aaf88dd25f9f2db364bab03111d37..a076047d112a737d8cda6a666ad6d3b951253890 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssome\scompiler\swarnings.\s(CVS\s2983)
-D 2006-01-20T17:56:33
+C More\scompiler\swarnings\sfixed\s-\sor\sin\ssome\scases\scomments\sare\sadded\sto\sexplain\nthat\sthe\scompiler\sis\swrong.\s(CVS\s2984)
+D 2006-01-20T18:10:57
 F Makefile.in ab3ffd8d469cef4477257169b82810030a6bb967
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -34,7 +34,7 @@ F src/alter.c 90b779cf00489535cab6490df6dc050f40e4e874
 F src/analyze.c 7d2b7ab9a9c2fd6e55700f69064dfdd3e36d7a8a
 F src/attach.c 0081040e9a5d13669b6712e947688c10f030bfc1
 F src/auth.c 9ae84d2d94eb96195e04515715e08e85963e96c2
-F src/btree.c 8b890e64b0ad7c510635244b75d65a97ee9f26ad
+F src/btree.c a1397e80f1db2d92ed246c8a134c7f0208585270
 F src/btree.h 5663c4f43e8521546ccebc8fc95acb013b8f3184
 F src/build.c 15224e2fd348ad32b9044aaa5bdc912e4067da15
 F src/callback.c 1bf497306c32229114f826707054df7ebe10abf2
@@ -46,7 +46,7 @@ F src/expr.c c541c569906daf6225d1a21afe4cba5d430233cd
 F src/func.c 96b26601c092b7b43a13e440e3f988b32a385f6a
 F src/hash.c 8747cf51d12de46512880dfcf1b68b4e24072863
 F src/hash.h 1b0c445e1c89ff2aaad9b4605ba61375af001e84
-F src/insert.c 4f338c85c26f8efabc77d5eb66f8ea63717789dc
+F src/insert.c 4d37e285459af9bc2ff92ae237285b12cd5e8a71
 F src/legacy.c 0fd27db5e07a46853b9876baaa370b40e75a9b40
 F src/main.c 439168db0a830efd0b9e7325aff39adc5524a1b5
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
@@ -55,18 +55,18 @@ F src/os.h e4637eadcd5a9ca079029078d31751ae295fb05e
 F src/os_common.h 95b29ca6f3e6636cb33c9219b3f91a96fa7224b1
 F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
-F src/os_unix.c a242a9458b08f01fa11d42b23bcdb89a3fbf2a68
+F src/os_unix.c 38a55e51fb2c6f32c0ce86d274f5787f6c3668ed
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
 F src/os_win.c 98e4e38db7d4a00647b2bb1c60d28b7ca5034c03
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
-F src/pager.c 39bf1957f8531c9056c8659048a4cdd949439d66
+F src/pager.c 7e124928343134286aac38eba62606b992c44344
 F src/pager.h e0acb095b3ad0bca48f2ab00c87346665643f64f
 F src/parse.y 83df51fea35f68f7e07384d75dce83d1ed30434c
 F src/pragma.c 4496cc77dc35824e1c978c3d1413b8a5a4c777d3
 F src/prepare.c 5d6f5b7194ee72cecd66cab49d15159e55d63f28
 F src/printf.c f47a2f4b5387cd2ebb12e9117a1a5d6bd9a2b812
 F src/random.c d40f8d356cecbd351ccfab6eaedd7ec1b54f5261
-F src/select.c e80ac3438d64bfdb1116660309f578eb1efed6e1
+F src/select.c 7a7f4f73a120fbd42e4f5708f5da7a57721bfc7f
 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c 66b073375efbdee19045e7e0cd38b85f9aff71da
 F src/sqlite.h.in 492580f7e3ff71eb43193eb7bb98e2d549889ce3
@@ -94,7 +94,7 @@ F src/vdbeapi.c 75eabedc09b3b2a6f2d256f85704b8b0cc0f50fa
 F src/vdbeaux.c 1dce6e5f51d6119220e12ecbceccccf97ca8b8be
 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
 F src/vdbemem.c 2034e93b32c14bda6e306bb54e3a8e930b963027
-F src/where.c 5215507b232e718606e0014f999912d53de32a70
+F src/where.c 7ce7a52fdc696d26cd9f9c939dc972585d3dd72d
 F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
 F test/aggerror.test b2223511ec37fcdeca023b5a261900f18261aad8
 F test/all.test 5df90d015ca63fcef2a4b62c24f7316b66c4bfd4
@@ -344,7 +344,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 7e34163a65a5842ecc50a14a9d60601e7c9d3249
-R 77096438c8040f326e52cdb94c95952f
+P b7bdac0afd99b8dc03749877f675a5f782120295
+R 257f8ebaf1a7df3e818e3ee3377c2e0b
 U drh
-Z c5d01588a78484aeb8ca737258b22ec5
+Z cb095a9dd724704d4668f7f90fbf8e42

diff --git a/manifest.uuid b/manifest.uuid
index f3e1499c5591dbb1822710853b0183045af7728d..a7e4cc50496861c6ed54201ff3b54e1539187f5d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b7bdac0afd99b8dc03749877f675a5f782120295
\ No newline at end of file
+507653a98cbd096f836a977408e373640c7cdb8f
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index cd558f7f43ea305798bd8c164dc5f38177706bca..e130148166f9ad7d374ec2c0c4de3d13d39142cf 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btree.c,v 1.304 2006/01/20 16:32:04 danielk1977 Exp $
+** $Id: btree.c,v 1.305 2006/01/20 18:10:57 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** For a detailed discussion of BTrees, refer to
@@ -5307,7 +5307,9 @@ int sqlite3BtreeDelete(BtCursor *pCur){
     */
     BtCursor leafCur;
     unsigned char *pNext;
-    int szNext;
+    int szNext;  /* The compiler warning is wrong: szNext is always 
+                 ** initialized before use.  Adding an extra initialization
+                 ** to silence the compiler slows down the code. */
     int notUsed;
     unsigned char *tempCell = 0;
     assert( !pPage->leafData );

diff --git a/src/insert.c b/src/insert.c
index d38e24f92bf68c53ee8d24b54f2e2a140d892950..993da99b022910a1676afcd073ce0f2036fa3550 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle INSERT statements in SQLite.
 **
-** $Id: insert.c,v 1.158 2006/01/18 16:51:35 danielk1977 Exp $
+** $Id: insert.c,v 1.159 2006/01/20 18:10:57 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -222,7 +222,7 @@ void sqlite3Insert(
 #endif
 
 #ifndef SQLITE_OMIT_AUTOINCREMENT
-  int counterRowid;     /* Memory cell holding rowid of autoinc counter */
+  int counterRowid = 0;  /* Memory cell holding rowid of autoinc counter */
 #endif
 
   if( pParse->nErr || sqlite3MallocFailed() ){

diff --git a/src/os_unix.c b/src/os_unix.c
index dfa33f2e2dd0bec8683c3886b62438be7c583261..b9c0121383083069cfed0e96236b83e46a137f7e 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1471,7 +1471,6 @@ static int unixUnlock(OsFile *id, int locktype){
 */
 static int unixClose(OsFile **pId){
   unixFile *id = (unixFile*)*pId;
-  int rc;
 
   if( !id ) return SQLITE_OK;
   unixUnlock(*pId, NO_LOCK);
@@ -1508,7 +1507,7 @@ static int unixClose(OsFile **pId){
   OpenCounter(-1);
   sqliteFree(id);
   *pId = 0;
-  return rc;
+  return SQLITE_OK;
 }
 
 /*

diff --git a/src/pager.c b/src/pager.c
index 29a5dbf48c4d11bfcc7acb88ee7f06fbbe8b2c30..6cc9869150039b71619c2c8c7a31635e9d1cd4fc 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
 ** file simultaneously, or one process from reading the database while
 ** another is writing.
 **
-** @(#) $Id: pager.c,v 1.247 2006/01/20 16:32:04 danielk1977 Exp $
+** @(#) $Id: pager.c,v 1.248 2006/01/20 18:10:57 drh Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -1566,7 +1566,7 @@ int sqlite3pager_open(
 ){
   Pager *pPager = 0;
   char *zFullPathname = 0;
-  int nameLen;
+  int nameLen;  /* Compiler is wrong. This is always initialized before use */
   OsFile *fd;
   int rc = SQLITE_OK;
   int i;

diff --git a/src/select.c b/src/select.c
index 4a50c65ee9cb7ad761d0e694592861933a7174b8..637017033c0cd8dce300eb6e0fb6555c11c3168e 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle SELECT statements in SQLite.
 **
-** $Id: select.c,v 1.295 2006/01/18 16:51:35 danielk1977 Exp $
+** $Id: select.c,v 1.296 2006/01/20 18:10:57 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -1388,8 +1388,8 @@ Vdbe *sqlite3GetVdbe(Parse *pParse){
 ** SELECT statements.
 */
 static void computeLimitRegisters(Parse *pParse, Select *p, int iBreak){
-  Vdbe *v;
-  int iLimit;
+  Vdbe *v = 0;
+  int iLimit = 0;
   int iOffset;
   int addr1, addr2;
 

diff --git a/src/where.c b/src/where.c
index 84cf3d1ba1b791771af108bb1de24a1f89c7326d..42766195cf0f6caff84c4fb12f8e51cd8a7da49a 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.199 2006/01/18 16:51:36 danielk1977 Exp $
+** $Id: where.c,v 1.200 2006/01/20 18:10:57 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -1508,7 +1508,7 @@ WhereInfo *sqlite3WhereBegin(
     int bestFlags = 0;          /* Flags associated with pBest */
     int bestNEq = 0;            /* nEq associated with pBest */
     double lowestCost;          /* Cost of the pBest */
-    int bestJ;                  /* The value of j */
+    int bestJ = 0;              /* The value of j */
     Bitmask m;                  /* Bitmask value for j or bestJ */
 
     lowestCost = SQLITE_BIG_DBL;