Fix some pointless warnings from overly-pedantic compilers. (CVS 3048)

FossilOrigin-Name: b922c8e45f9a7799583d8b42875b27032fd71422

diff --git a/manifest b/manifest
index 0484101efc0627d418f6e5aa1810cd1c19a5c555..da368d0a3fce5535463e87d9ccc76ba0ed74549f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C 3rd\sparameter\sto\ssqlite3_prepare()\sshould\sbe\s-1\sif\sthe\sstring\slength\sis\r\nunknown.\s\sPassing\sin\szero\scauses\sa\szero-length\sSQL\sstatement\sto\sbe\r\nprepared,\swhich\sis\sa\sno-op.\s\sTicket\s#1651.\s\sThis\sbug\sintroduced\sby\sthe\r\nfix\sfor\sticket\s#1650.\s(CVS\s3047)
-D 2006-01-31T19:07:22
+C Fix\ssome\spointless\swarnings\sfrom\soverly-pedantic\scompilers.\s(CVS\s3048)
+D 2006-01-31T19:31:44
 F Makefile.in e936c6fc3134838318aa0335a85041e6da31f6ee
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -48,7 +48,7 @@ F src/hash.c 8747cf51d12de46512880dfcf1b68b4e24072863
 F src/hash.h 1b0c445e1c89ff2aaad9b4605ba61375af001e84
 F src/insert.c 7e931b7f06afbcefcbbaab175c02eff8268db33f
 F src/legacy.c 86b669707b3cefd570e34154e2f6457547d1df4f
-F src/main.c 2693776249865dc69b97904205638e84a34a059c
+F src/main.c 5c890c27e05e083e4df2547ae3679f21ed05adc3
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
 F src/os.c 59f05de8c5777c34876607114a2fbe55ae578235
 F src/os.h 93035a0e3b9dd05cdd0aaef32ea28ca28e02fe78
@@ -57,7 +57,7 @@ F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
 F src/os_unix.c 73c5e722a661ed98d8919f204911e4e34e51fa41
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
-F src/os_win.c 566bf7b41b72556fd7dca390bceaa2769dc395e9
+F src/os_win.c c67a2c46d929cf54c8f80ec5e6079cf684a141a9
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
 F src/pager.c b5b380ea7a36f84e50c3adc1a414820a0eb3baa6
 F src/pager.h e0acb095b3ad0bca48f2ab00c87346665643f64f
@@ -68,7 +68,7 @@ F src/printf.c c7d6ad9efb71c466305297a448308f467b6e2b6e
 F src/random.c d40f8d356cecbd351ccfab6eaedd7ec1b54f5261
 F src/select.c daee9b20702ba51cf3807fc1b130edd8846e3e48
 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
-F src/shell.c fc75e0c95695647d7eecfcd8616755a3ac1da65d
+F src/shell.c 738f55ed75fb36731e764bfdb40756ac43b90b08
 F src/sqlite.h.in 492580f7e3ff71eb43193eb7bb98e2d549889ce3
 F src/sqliteInt.h 0121298397ac14eb468ab1ba9d488ac7ed7d88a1
 F src/table.c 486dcfce532685b53b5a2b5da8bba0ded6fb2316
@@ -89,7 +89,7 @@ F src/update.c 14be4ba2f438919b4217085c02feff569e6cf1f2
 F src/utf.c 1199766bbb0157931a83aa6eede6b6381177be64
 F src/util.c 82ee598519b8193184bdeab06b51a4ffa05ad60b
 F src/vacuum.c 3865673cc66acd0717ecd517f6b8fdb2a5e7924b
-F src/vdbe.c fee677e05236e483d6c75d1d4229955fc1b89193
+F src/vdbe.c 29c68f39ce8cba44814b0e1f3d909ef961eb28a7
 F src/vdbe.h 8729a4ee16ff9aeab2af9667df3cf300ff978e13
 F src/vdbeInt.h eb3f86ab08ef11635bc78eb88c3ff13f923c233b
 F src/vdbeapi.c dcb2636f49b4807e34960d52a2fc257b3a751140
@@ -349,7 +349,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 10a3f5654616cfe5b245f1348249101a7d956222
-R 8e3224f314f61c4c427170e0050b4bd4
+P 1e68ac590d9edd3784cd7afd6705a30f01740d0d
+R feb097bc1a919e0dd1614ba63778df07
 U drh
-Z a6d5897bc00fd9aedbdfb205e17096ef
+Z df3a79e7f43ae3ab965d8e06e4f48612

diff --git a/manifest.uuid b/manifest.uuid
index ef6a1a2f65effc2ad37d1b621d72d6debab8da7f..894867c2c6253209ecd715017287af5f05645e65 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1e68ac590d9edd3784cd7afd6705a30f01740d0d
\ No newline at end of file
+b922c8e45f9a7799583d8b42875b27032fd71422
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 7daadf6936fd42a9272ac230cff91a6492fe8a7e..4dfb3589da9a77a106372b3073820024f38e3e09 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.331 2006/01/24 16:37:58 danielk1977 Exp $
+** $Id: main.c,v 1.332 2006/01/31 19:31:44 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -29,7 +29,6 @@ const int sqlite3one = 1;
 /*
 ** The version of the library
 */
-const char rcsid3[] = "@(#) \044Id: SQLite version " SQLITE_VERSION " $";
 const char sqlite3_version[] = SQLITE_VERSION;
 const char *sqlite3_libversion(void){ return sqlite3_version; }
 int sqlite3_libversion_number(void){ return SQLITE_VERSION_NUMBER; }

diff --git a/src/os_win.c b/src/os_win.c
index 944d6e29d1e5db91ccf9f053bcd8db001653fb25..78a09083d990cea12b198d61dab9652c640a77fd 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -1479,7 +1479,7 @@ int sqlite3_tsd_count = 0;
 ThreadData *sqlite3WinThreadSpecificData(int allocateFlag){
   static int key;
   static int keyInit = 0;
-  static const ThreadData zeroData;
+  static const ThreadData zeroData = {0};
   ThreadData *pTsd;
 
   if( !keyInit ){

diff --git a/src/shell.c b/src/shell.c
index 2ada35b7f26393be146d7a39895dce8d0a1e9b79..09832d0360fee2123f3b9a492df1dab57e0e0ff7 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -12,7 +12,7 @@
 ** This file contains code to implement the "sqlite" command line
 ** utility for accessing SQLite databases.
 **
-** $Id: shell.c,v 1.132 2006/01/31 19:07:22 drh Exp $
+** $Id: shell.c,v 1.133 2006/01/31 19:31:44 drh Exp $
 */
 #include <stdlib.h>
 #include <string.h>
@@ -247,7 +247,7 @@ struct callback_data {
 #define MODE_Csv      7  /* Quote strings, numbers are plain */
 #define MODE_NUM_OF   8  /* The number of modes (not a mode itself) */
 
-char *modeDescr[MODE_NUM_OF] = {
+static const char *modeDescr[MODE_NUM_OF] = {
   "line",
   "column",
   "list",
@@ -1618,7 +1618,7 @@ static void usage(int showDetail){
 /*
 ** Initialize the state information in data
 */
-void main_init(struct callback_data *data) {
+static void main_init(struct callback_data *data) {
   memset(data, 0, sizeof(*data));
   data->mode = MODE_List;
   strcpy(data->separator,"|");

diff --git a/src/vdbe.c b/src/vdbe.c
index 670c359c8b9ffb8950a47b333b01f335474bc64d..557b9e8b1977ba0c2a750b1216be17538800c40c 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.540 2006/01/30 15:34:23 drh Exp $
+** $Id: vdbe.c,v 1.541 2006/01/31 19:31:44 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -3815,7 +3815,7 @@ case OP_IdxGE: {        /* no-push */
   assert( p->apCsr[i]!=0 );
   assert( pTos>=p->aStack );
   if( (pC = p->apCsr[i])->pCursor!=0 ){
-    int res, rc;
+    int res;
  
     assert( pTos->flags & MEM_Blob );  /* Created using OP_Make*Key */
     Stringify(pTos, encoding);