Fix some compiler warnings in test code. (CVS 6392)

FossilOrigin-Name: a43ecc9cb91ea8693e0fcce12c1bb5c5e4baf434

diff --git a/manifest b/manifest
index 2299c2b9f497eab4b338a2fc9624ab485971b25c..5f448ccb5b87a79bb23d0b865102af9c2494c1f6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sincompatibility\sbetween\sthe\stest_async.c\sbackend\sand\schange\s(6390).\s(CVS\s6391)
-D 2009-03-27T09:10:12
+C Fix\ssome\scompiler\swarnings\sin\stest\scode.\s(CVS\s6392)
+D 2009-03-27T12:32:55
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -163,8 +163,8 @@ F src/sqliteInt.h 7fe33227434a3e54e3056cbe95800bd09a636fbe
 F src/sqliteLimit.h ffe93f5a0c4e7bd13e70cd7bf84cfb5c3465f45d
 F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
 F src/table.c 332ab0ea691e63862e2a8bdfe2c0617ee61062a3
-F src/tclsqlite.c 3d64c59fa441c4b6d550cb97b03c91693b87bbd1
-F src/test1.c 17300af44640eea439778f5b5e03e0d68a6f00a2
+F src/tclsqlite.c 37d34e4131845584940d04729a18fc8441a7d35d
+F src/test1.c fc09299ecf3e7d1235293ba43dcc7ea003240a54
 F src/test2.c 71c22e2974f8094fe0fd1eba8f27872dde9b2a39
 F src/test3.c d3115b301c6ee761b102f315fe24125f3d6c3a4d
 F src/test4.c f79ab52d27ff49b784b631a42e2ccd52cfd5c84c
@@ -192,7 +192,7 @@ F src/test_pcache.c 29464896d9c67832e4eef916c0682b98d7283d00
 F src/test_schema.c 4b4bf7bb329326458c491b0e6facd4c8c4c5b479
 F src/test_server.c f0a403b5f699c09bd2b1236b6f69830fd6221f6b
 F src/test_tclvar.c 9e42fa59d3d2f064b7ab8628e7ab2dc8a9fe93d4
-F src/test_thread.c 7b409dc9f8058e20b6697f97a6382ac75b16da5d
+F src/test_thread.c b8a1ab7ca1a632f18e8a361880d5d65eeea08eac
 F src/test_wsd.c 3ae5101de6cbfda2720152ab659ea84079719241
 F src/tokenize.c fff72a9bc0af326583e5966daecebeb5ed9b9614
 F src/trigger.c 21f39db410cdc32166a94900ac1b3df98ea560e6
@@ -710,7 +710,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 80241a050296067937d0b0529fdf0c347358f86c
-R f73bd2ee7d954b8f8bc826b395ab6f00
-U danielk1977
-Z 3409c9edf374b9bb740dc4afc4beb7ff
+P 6762625d29d5e0053afdad033fe54e2d9121046a
+R b604a9da188edcf7941d8804ba52fd05
+U drh
+Z 602f07abcb75475a1190577a6bb558d7

diff --git a/manifest.uuid b/manifest.uuid
index 0d366638cc979f47a0b08228c7cf5a6c8a862a0f..4309c9c57306ccf9a51d0fe2b24e637f08ca9aed 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6762625d29d5e0053afdad033fe54e2d9121046a
\ No newline at end of file
+a43ecc9cb91ea8693e0fcce12c1bb5c5e4baf434
\ No newline at end of file

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 8959e607418e23e770eb124a07ada2f6246af5f2..854bbb0f0c2e49ea94ae59664893179a7d25626d 100644 (file)
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -12,7 +12,7 @@
 ** A TCL Interface to SQLite.  Append this file to sqlite3.c and
 ** compile the whole thing to build a TCL-enabled version of SQLite.
 **
-** $Id: tclsqlite.c,v 1.239 2009/03/24 15:08:10 drh Exp $
+** $Id: tclsqlite.c,v 1.240 2009/03/27 12:32:55 drh Exp $
 */
 #include "tcl.h"
 #include <errno.h>
@@ -587,6 +587,7 @@ static void setTestUnlockNotifyVars(Tcl_Interp *interp, int iArg, int nArg){
   #define setTestUnlockNotifyVars(x,y,z)
 #endif
 
+#ifdef SQLITE_ENABLE_UNLOCK_NOTIFY
 static void DbUnlockNotify(void **apArg, int nArg){
   int i;
   for(i=0; i<nArg; i++){
@@ -599,6 +600,7 @@ static void DbUnlockNotify(void **apArg, int nArg){
     pDb->pUnlockNotify = 0;
   }
 }
+#endif
 
 static void DbUpdateHandler(
   void *p, 

diff --git a/src/test1.c b/src/test1.c
index e3e8df14312cf97233110f5f1ac0d2fa9d1d0c44..0fe3e28b184025b0a4d2e4bf9f9e9ed0dc2aa20c 100644 (file)
--- 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.348 2009/03/16 13:19:36 danielk1977 Exp $
+** $Id: test1.c,v 1.349 2009/03/27 12:32:55 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -4835,12 +4835,14 @@ static int test_pcache_stats(
   return TCL_OK;
 }
 
+#ifdef SQLITE_ENABLE_UNLOCK_NOTIFY
 static void test_unlock_notify_cb(void **aArg, int nArg){
   int ii;
   for(ii=0; ii<nArg; ii++){
     Tcl_EvalEx((Tcl_Interp *)aArg[ii], "unlock_notify", -1, TCL_EVAL_GLOBAL);
   }
 }
+#endif /* SQLITE_ENABLE_UNLOCK_NOTIFY */
 
 /*
 ** tclcmd:  sqlite3_unlock_notify db

diff --git a/src/test_thread.c b/src/test_thread.c
index 2507e5f5510350549ad4c816aa8e57c6dc7d1dfb..fc372a2923433815e13fad0ec0835d70c5b48595 100644 (file)
--- a/src/test_thread.c
+++ b/src/test_thread.c
@@ -14,7 +14,7 @@
 ** test that sqlite3 database handles may be concurrently accessed by 
 ** multiple threads. Right now this only works on unix.
 **
-** $Id: test_thread.c,v 1.14 2009/03/24 18:42:16 drh Exp $
+** $Id: test_thread.c,v 1.15 2009/03/27 12:32:56 drh Exp $
 */
 
 #include "sqliteInt.h"
@@ -55,8 +55,10 @@ struct EvalEvent {
 
 static Tcl_ObjCmdProc sqlthread_proc;
 static Tcl_ObjCmdProc clock_seconds_proc;
+#if defined(SQLITE_OS_UNIX) && defined(SQLITE_ENABLE_UNLOCK_NOTIFY)
 static Tcl_ObjCmdProc blocking_step_proc;
 static Tcl_ObjCmdProc blocking_prepare_v2_proc;
+#endif
 int Sqlitetest1_Init(Tcl_Interp *);
 
 /* Functions from test1.c */
@@ -599,7 +601,7 @@ static int blocking_prepare_v2_proc(
   return TCL_OK;
 }
 
-#endif
+#endif /* SQLITE_OS_UNIX && SQLITE_ENABLE_UNLOCK_NOTIFY */
 /*
 ** End of implementation of [sqlite3_blocking_step].
 ************************************************************************/