From: drh <drh@noemail.net>
Date: Fri, 20 Jan 2006 17:56:32 +0000 (+0000)
Subject: Fix some compiler warnings. (CVS 2983)
X-Git-Tag: version-3.6.10~3184
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24bd82c396d7608733affc67d3b40fde3eba646b;p=thirdparty%2Fsqlite.git

Fix some compiler warnings. (CVS 2983)

FossilOrigin-Name: b7bdac0afd99b8dc03749877f675a5f782120295
---

diff --git a/manifest b/manifest
index f4677882cc..f11985b54a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sanother\scouple\sof\sIO\sor\smalloc()\sfailure\sproblems\sin\sa\sshared-cache\scontext.\s(CVS\s2982)
-D 2006-01-20T16:32:04
+C Fix\ssome\scompiler\swarnings.\s(CVS\s2983)
+D 2006-01-20T17:56:33
 F Makefile.in ab3ffd8d469cef4477257169b82810030a6bb967
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -76,22 +76,22 @@ F src/tclsqlite.c d650bea0248fc0a310ddc2cb94273a3a5021fddf
 F src/test1.c bcdd1978cb4f576611917948728acd09ede9c85d
 F src/test2.c ca74a1d8aeb7d9606e8f6b762c5daf85c1a3f92b
 F src/test3.c 86e99724ee898b119ed575ef9f98618afe7e5e5d
-F src/test4.c 6633cb7b4a7429e938804a34f688d118c8b7f8e1
+F src/test4.c ff4e9406b3d2809966d8f0e82468ac5508be9f56
 F src/test5.c 7162f8526affb771c4ed256826eee7bb9eca265f
 F src/test6.c 74d91b487c68154156eded457925d96aa2a3fdbb
-F src/test7.c c87fd373a613986113717ba51e6a5ad86407c1f7
+F src/test7.c d28d3e62f9594923648fc6a8fb030eba36564ba1
 F src/test_async.c 6776f5027ca6378c116ff5ccc2fe41b908e33772
-F src/tokenize.c 1ac078540c2074568e16c0e9beea836fb16b1adc
+F src/tokenize.c 9ae9a59238eb97fbc61baea280563b91100518fb
 F src/trigger.c 4d3644cbd16959b568c95ae73493402be8021b08
 F src/update.c 14be4ba2f438919b4217085c02feff569e6cf1f2
 F src/utf.c 5ab8ca05d4e9ec81174b010f01ab12a232f0087d
-F src/util.c 14f1f842caede231c8f72308c40d8e1f1cbec59e
+F src/util.c 2510e040166cb07b7e8ed0c1ccaec22350d57df4
 F src/vacuum.c 3865673cc66acd0717ecd517f6b8fdb2a5e7924b
 F src/vdbe.c 9eceb866b8197d25d07f700e16b1a50638d4bd6e
 F src/vdbe.h 8729a4ee16ff9aeab2af9667df3cf300ff978e13
 F src/vdbeInt.h eb3f86ab08ef11635bc78eb88c3ff13f923c233b
 F src/vdbeapi.c 75eabedc09b3b2a6f2d256f85704b8b0cc0f50fa
-F src/vdbeaux.c 9d92640082c632ab2a48fa0b1763390a78573607
+F src/vdbeaux.c 1dce6e5f51d6119220e12ecbceccccf97ca8b8be
 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
 F src/vdbemem.c 2034e93b32c14bda6e306bb54e3a8e930b963027
 F src/where.c 5215507b232e718606e0014f999912d53de32a70
@@ -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 fd4a6bb1ac94d085dda247799c0a5c64aaeec046
-R bde9ce22812627a378f8978bb7879372
-U danielk1977
-Z c8dd5ea23e29760f9b39f58f5d5d0fb8
+P 7e34163a65a5842ecc50a14a9d60601e7c9d3249
+R 77096438c8040f326e52cdb94c95952f
+U drh
+Z c5d01588a78484aeb8ca737258b22ec5
diff --git a/manifest.uuid b/manifest.uuid
index 5e2ee2f34c..f3e1499c55 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7e34163a65a5842ecc50a14a9d60601e7c9d3249
\ No newline at end of file
+b7bdac0afd99b8dc03749877f675a5f782120295
\ No newline at end of file
diff --git a/src/test4.c b/src/test4.c
index 0abee5a954..250da9b13c 100644
--- a/src/test4.c
+++ b/src/test4.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Code for testing the the SQLite library in a multithreaded environment.
 **
-** $Id: test4.c,v 1.15 2006/01/15 02:30:58 drh Exp $
+** $Id: test4.c,v 1.16 2006/01/20 17:56:33 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -496,7 +496,7 @@ static void do_step(Thread *p){
   if( p->rc==SQLITE_ROW ){
     p->argc = sqlite3_column_count(p->pStmt);
     for(i=0; i<sqlite3_data_count(p->pStmt); i++){
-      p->argv[i] = sqlite3_column_text(p->pStmt, i);
+      p->argv[i] = (char*)sqlite3_column_text(p->pStmt, i);
     }
     for(i=0; i<p->argc; i++){
       p->colv[i] = sqlite3_column_name(p->pStmt, i);
diff --git a/src/test7.c b/src/test7.c
index 32f4d3c38e..1adb4a016b 100644
--- a/src/test7.c
+++ b/src/test7.c
@@ -12,7 +12,7 @@
 ** Code for testing the client/server version of the SQLite library.
 ** Derived from test4.c.
 **
-** $Id: test7.c,v 1.2 2006/01/11 23:40:34 drh Exp $
+** $Id: test7.c,v 1.3 2006/01/20 17:56:33 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -526,7 +526,7 @@ static void do_step(Thread *p){
   if( p->rc==SQLITE_ROW ){
     p->argc = sqlite3_column_count(p->pStmt);
     for(i=0; i<sqlite3_data_count(p->pStmt); i++){
-      p->argv[i] = sqlite3_column_text(p->pStmt, i);
+      p->argv[i] = (char*)sqlite3_column_text(p->pStmt, i);
     }
     for(i=0; i<p->argc; i++){
       p->colv[i] = sqlite3_column_name(p->pStmt, i);
diff --git a/src/tokenize.c b/src/tokenize.c
index 339979dfb7..5fbb3c4b63 100644
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -15,7 +15,7 @@
 ** individual tokens and sends those tokens one-by-one over to the
 ** parser for analysis.
 **
-** $Id: tokenize.c,v 1.115 2006/01/18 16:51:36 danielk1977 Exp $
+** $Id: tokenize.c,v 1.116 2006/01/20 17:56:33 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -339,7 +339,6 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
   int tokenType;
   int lastTokenParsed = -1;
   sqlite3 *db = pParse->db;
-  ThreadData *pTsd = pParse->pTsd;
   extern void *sqlite3ParserAlloc(void*(*)(int));
   extern void sqlite3ParserFree(void*, void(*)(void*));
   extern int sqlite3Parser(void*, int, Token, Parse*);
diff --git a/src/util.c b/src/util.c
index d947a7bdee..233aa7bb5c 100644
--- a/src/util.c
+++ b/src/util.c
@@ -14,7 +14,7 @@
 ** This file contains functions for allocating memory, comparing
 ** strings, and stuff like that.
 **
-** $Id: util.c,v 1.179 2006/01/19 07:18:14 danielk1977 Exp $
+** $Id: util.c,v 1.180 2006/01/20 17:56:33 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -566,7 +566,7 @@ void *sqlite3MallocRaw(int n){
       ** handleSoftLimit() above. This is so the ThreadData.nAlloc variable is
       ** still correct after a malloc() failure. 
       */
-      handleSoftLimit(n * -1);
+      (void)handleSoftLimit(n * -1);
       sqlite3FailedMalloc();
       OSMALLOC_FAILED();
     }
@@ -596,7 +596,7 @@ void *sqlite3Realloc(void *p, int n){
         ** handleSoftLimit() above. This is so the ThreadData.nAlloc variable is
         ** still correct after a malloc() failure. 
         */
-        handleSoftLimit(OSSIZEOF(p) - n);
+        (void)handleSoftLimit(OSSIZEOF(p) - n);
         sqlite3FailedMalloc();
         OSMALLOC_FAILED();
       }
@@ -610,7 +610,7 @@ void *sqlite3Realloc(void *p, int n){
 ** value returned by a previous call to sqlite3Malloc() or sqlite3Realloc().
 */
 void sqlite3FreeX(void *p){
-  handleSoftLimit(0 - OSSIZEOF(p));
+  (void)handleSoftLimit(0 - OSSIZEOF(p));
   if( p ){
     OSFREE(p);
   }
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index d9c191d54e..ca3cada8be 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -1111,11 +1111,6 @@ static void abortOtherActiveVdbes(Vdbe *pVdbe){
   }
 }
 
-static void rollbackAll(sqlite3 *db, Vdbe *pVdbe){
-  abortOtherActiveVdbes(pVdbe);
-  sqlite3RollbackAll(db);
-}
-
 /* 
 ** This routine checks that the sqlite3.activeVdbeCnt count variable
 ** matches the number of vdbe's in the list sqlite3.pVdbe that are