From: drh <drh@noemail.net>
Date: Thu, 16 Mar 2006 16:19:56 +0000 (+0000)
Subject: Fix some compiler warnings. (CVS 3140)
X-Git-Tag: version-3.6.10~3027
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3752785f933071c48e097ab2e690bc19a36ed955;p=thirdparty%2Fsqlite.git

Fix some compiler warnings. (CVS 3140)

FossilOrigin-Name: 6c5175bc0f98e4ce715b099394f3fdc878ed82e8
---

diff --git a/manifest b/manifest
index a9769b9eef..4cc5bc6a97 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sprovisions\sin\sthe\scode\sto\ssupport\sProvisions\sto\ssupport\scaching\sof\nserialized\sstatements\sin\sthe\sSSE\sextension.\s(CVS\s3139)
-D 2006-03-16T14:05:15
+C Fix\ssome\scompiler\swarnings.\s(CVS\s3140)
+D 2006-03-16T16:19:56
 F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -43,12 +43,12 @@ F src/date.c cd2bd5d1ebc6fa12d6312f69789ae5b0a2766f2e
 F src/delete.c 2dea1a83e6ef534346e74fd03114d3a7b16f08fc
 F src/experimental.c 1b2d1a6cd62ecc39610e97670332ca073c50792b
 F src/expr.c 105e8e17babd4dec832d4a0c88bea12ec074cbbe
-F src/func.c ea1a4480bacfb17f8e08d675313f024fe7136c00
+F src/func.c 380f2f8e555ccbf899e65f01475c4ac13c478dc2
 F src/hash.c 449f3d6620193aa557f5d86cbc5cc6b87702b185
 F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564
 F src/insert.c 1ae4b8ff5549497808e1b57b9243abcb599fd02f
 F src/legacy.c fa15d505dd4e45044177ee4d1c6aeaf8c836d390
-F src/main.c a025a1990c02c53433a8fda9c481990e513a1e21
+F src/main.c 5cdd81aaf159836b5ca277192da4f7461fd15078
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
 F src/os.c 59f05de8c5777c34876607114a2fbe55ae578235
 F src/os.h 93035a0e3b9dd05cdd0aaef32ea28ca28e02fe78
@@ -59,7 +59,7 @@ F src/os_unix.c 757a7b726764367f7b0595c4302969582c04413d
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
 F src/os_win.c 8ced9ac82670bbf77492961a2f7ff80a87f1404f
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
-F src/pager.c 7b1975e2fa56fc3c9859bec321f57cd3d75ec36b
+F src/pager.c 0e5a3d1e7e6822e731da4ea90eedff3c7857ddc9
 F src/pager.h 43f32f3847421f7502cfbb66f4eb2302b8033818
 F src/parse.y ee1887ce0e6eea15cc728913ad3462898f88e9b0
 F src/pragma.c 27d5e395c5d950931c7ac4fe610e7c2993e2fa55
@@ -72,8 +72,8 @@ F src/shell.c 7a4b16f85d8f6f25d917cdc3d0f7e18f84867adf
 F src/sqlite.h.in 0bf6f03f9a14dde5f3a4f87471840803acaa4497
 F src/sqliteInt.h 8c5788a32da5c0b8fdfddc1497b5b38ee3a2c17d
 F src/table.c f64ec4fbfe333f8df925bc6ba494f55e05b0e75e
-F src/tclsqlite.c 607ccf5ade808ed3620544baca42b13e3411bf6d
-F src/test1.c 9d299609a0ce35157fe15cdf8b4c663db5d40386
+F src/tclsqlite.c d20bdf1822c47e367f5acd37823ffe67df40301c
+F src/test1.c d1f210f3a295670e5d82d620bea46fabc73bb0ea
 F src/test2.c ca74a1d8aeb7d9606e8f6b762c5daf85c1a3f92b
 F src/test3.c 86e99724ee898b119ed575ef9f98618afe7e5e5d
 F src/test4.c 8b784cd82de158a2317cb4ac4bc86f91ad315e25
@@ -355,7 +355,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 6bcbe8fcad35de6e9b90e7776bd262fdf7cbc28e
-R 10827db1d469ad8fd02846eb72ab30c5
+P 5048fae04227857c064c0ba48eb11bedeb467df0
+R 7208193fddae26aaa731b3eae4156afb
 U drh
-Z 11bdf70875327af2f51fc9ce471660b6
+Z 6d1979f8c99cc176c714b0360fc60414
diff --git a/manifest.uuid b/manifest.uuid
index 3b99393dc9..0a1b109455 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5048fae04227857c064c0ba48eb11bedeb467df0
\ No newline at end of file
+6c5175bc0f98e4ce715b099394f3fdc878ed82e8
\ No newline at end of file
diff --git a/src/func.c b/src/func.c
index 951365115c..73ae8f6c77 100644
--- a/src/func.c
+++ b/src/func.c
@@ -16,7 +16,7 @@
 ** sqliteRegisterBuildinFunctions() found at the bottom of the file.
 ** All other code has file scope.
 **
-** $Id: func.c,v 1.125 2006/03/02 03:02:48 drh Exp $
+** $Id: func.c,v 1.126 2006/03/16 16:19:56 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -1079,7 +1079,7 @@ void sqlite3RegisterBuiltinFunctions(sqlite3 *db){
   }
   sqlite3RegisterDateTimeFunctions(db);
 #ifdef SQLITE_SSE
-  sqlite3SseFunctions(db);
+  (void)sqlite3SseFunctions(db);
 #endif
 #ifdef SQLITE_CASE_SENSITIVE_LIKE
   sqlite3RegisterLikeFunctions(db, 1);
diff --git a/src/main.c b/src/main.c
index 44060403a9..5f0b89bfdf 100644
--- 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.338 2006/03/16 14:05:15 drh Exp $
+** $Id: main.c,v 1.339 2006/03/16 16:19:56 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -109,7 +109,10 @@ int sqlite3_close(sqlite3 *db){
   }
 
 #ifdef SQLITE_SSE
-  sqlite3SseCleanup(db);
+  {
+    extern void sqlite3SseCleanup(sqlite3*);
+    sqlite3SseCleanup(db);
+  }
 #endif 
 
   /* If there are any outstanding VMs, return SQLITE_BUSY. */
diff --git a/src/pager.c b/src/pager.c
index 865dc95099..7e77048fef 100644
--- 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.262 2006/03/06 20:55:46 drh Exp $
+** @(#) $Id: pager.c,v 1.263 2006/03/16 16:19:56 drh Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -3005,7 +3005,7 @@ int sqlite3pager_write(void *pData){
           ** that we do not. */
           assert( pPg->pgno!=PAGER_MJ_PGNO(pPager) );
           pData2 = CODEC2(pPager, pData, pPg->pgno, 7);
-          cksum = pager_cksum(pPager, pData2);
+          cksum = pager_cksum(pPager, (u8*)pData2);
           pEnd = pData2 + pPager->pageSize;
           pData2 -= 4;
           saved = *(u32*)pEnd;
diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 1c077bd8d2..cc9b8def08 100644
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** A TCL Interface to SQLite
 **
-** $Id: tclsqlite.c,v 1.154 2006/03/06 23:30:52 drh Exp $
+** $Id: tclsqlite.c,v 1.155 2006/03/16 16:19:56 drh Exp $
 */
 #ifndef NO_TCL     /* Omit this whole file if TCL is unavailable */
 
@@ -1088,7 +1088,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
       fclose(in);
       return TCL_ERROR;
     }
-    sqlite3_exec(pDb->db, "BEGIN", 0, 0, 0);
+    (void)sqlite3_exec(pDb->db, "BEGIN", 0, 0, 0);
     zCommit = "COMMIT";
     while( (zLine = local_getline(0, in))!=0 ){
       char *z;
@@ -1136,7 +1136,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
     free(azCol);
     fclose(in);
     sqlite3_finalize(pStmt);
-    sqlite3_exec(pDb->db, zCommit, 0, 0, 0);
+    (void)sqlite3_exec(pDb->db, zCommit, 0, 0, 0);
 
     if( zCommit[0] == 'C' ){
       /* success, set result as number of lines processed */
@@ -1847,7 +1847,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
     }
     inTrans = !sqlite3_get_autocommit(pDb->db);
     if( !inTrans ){
-      sqlite3_exec(pDb->db, zBegin, 0, 0, 0);
+      (void)sqlite3_exec(pDb->db, zBegin, 0, 0, 0);
     }
     rc = Tcl_EvalObjEx(interp, pScript, 0);
     if( !inTrans ){
@@ -1857,7 +1857,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
       } else {
         zEnd = "COMMIT";
       }
-      sqlite3_exec(pDb->db, zEnd, 0, 0, 0);
+      (void)sqlite3_exec(pDb->db, zEnd, 0, 0, 0);
     }
     break;
   }
diff --git a/src/test1.c b/src/test1.c
index 82a42ad70f..ffcecc46b5 100644
--- a/src/test1.c
+++ b/src/test1.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test1.c,v 1.207 2006/02/16 18:16:37 drh Exp $
+** $Id: test1.c,v 1.208 2006/03/16 16:19:56 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -488,7 +488,7 @@ static void sqlite3ExecFunc(
 ){
   struct dstr x;
   memset(&x, 0, sizeof(x));
-  sqlite3_exec((sqlite3*)sqlite3_user_data(context),
+  (void)sqlite3_exec((sqlite3*)sqlite3_user_data(context),
       (char*)sqlite3_value_text(argv[0]),
       execFuncCallback, &x, 0);
   sqlite3_result_text(context, x.z, x.nUsed, SQLITE_TRANSIENT);
@@ -3008,7 +3008,7 @@ static int test_stack_used(
   }
   if( getDbPointer(interp, argv[1], &db) ) return TCL_ERROR;
   prepStack();
-  sqlite3_exec(db, argv[2], 0, 0, 0);
+  (void)sqlite3_exec(db, argv[2], 0, 0, 0);
   for(i=65535; i>=0 && ((u32*)sqlite3_stack_baseline)[-i]==0xdeadbeef; i--){}
   Tcl_SetObjResult(interp, Tcl_NewIntObj(i*4));
   return TCL_OK;