Fix some compiler warnings. (CVS 2983)

FossilOrigin-Name: b7bdac0afd99b8dc03749877f675a5f782120295

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);

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);

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*);

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);
   }

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