Fix a couple of compiler warnings in test_superlock.c. Add superlock.c

to the Makefile.in used by the configure script.

FossilOrigin-Name: 461f1a010f55e7da6b43ea65550066b1ca7abad0

diff --git a/Makefile.in b/Makefile.in
index c9d42c622d8dc5d5ce1d74d7fd29667f58048946..d5e29a1bc593fc054c9c7b368367d6451f75cc38 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -373,6 +373,7 @@ TESTSRC = \
   $(TOP)/src/test_rtree.c \
   $(TOP)/src/test_schema.c \
   $(TOP)/src/test_server.c \
+  $(TOP)/src/test_superlock.c \
   $(TOP)/src/test_stat.c \
   $(TOP)/src/test_tclvar.c \
   $(TOP)/src/test_thread.c \

diff --git a/manifest b/manifest
index ca78f5f57cf65695b0326a12b1585298e7ac34f0..1f0ed38e4949cdaedef2f6dc79984d0e474772b1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Cherry-pick\sthe\slemon.c\supdates\sout\sof\sthe\slemon-update-2010\sbranch\sinto\nthe\strunk.
-D 2010-11-23T20:55:28
+C Fix\sa\scouple\sof\scompiler\swarnings\sin\stest_superlock.c.\s\sAdd\ssuperlock.c\nto\sthe\sMakefile.in\sused\sby\sthe\sconfigure\sscript.
+D 2010-11-24T13:04:22
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in e7a59672eaeb04408d1fa8501618d7501a3c5e39
+F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@ -220,7 +220,7 @@ F src/test_rtree.c 30c981837445a4e187ee850a49c4760d9642f7c3
 F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
 F src/test_server.c bbba05c144b5fc4b52ff650a4328027b3fa5fcc6
 F src/test_stat.c f682704b5d1ba8e1d4e7e882a6d7922e2dcf066c
-F src/test_superlock.c 714bb877e599f96a4923b5429ab36737c3166b09
+F src/test_superlock.c c0c0b1f73254a0c4ad5aca69e627fe32f571f7f9
 F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
 F src/test_thread.c bedd05cad673dba53326f3aa468cc803038896c0
 F src/test_vfs.c e10fcca756cafa89438311b31522ac1f95bf784b
@@ -892,14 +892,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 30c26c3b13b29ce57683e91ac11641d4eb4d678f
-R 72283ec8f14296c59c33e7774336f275
+P 1541ae3fbd7b3d471e002c0ad14e7846f7ad9415
+R 23ed169dd1eaa7c16f1bbe2fbe57a18a
 U drh
-Z 7e739e5816a1584d8ca3b44183fb81cf
+Z b29da3037485bdfcaa04aa9867a77538
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFM7CpEoxKgR168RlERAlpwAKCEXdv2H49b7AUwYJOI3caaskaLhgCdGk48
-r7jQLf8ZaN8Ct1Qy/4IOIYc=
-=CyGg
+iD8DBQFM7Q1ZoxKgR168RlERAkTlAJ9pPhSfkPTLg/Rq/zg1H6kQDC/rjQCggZ30
+DP3n4Bo1JUANTa9Pez3/EXc=
+=OzBi
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index fc4d3523d3a65ea727d1cd30bcd6f7c9248e52e5..95dc69ba83172b13d5ba56d16169bf95a5e5b504 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1541ae3fbd7b3d471e002c0ad14e7846f7ad9415
\ No newline at end of file
+461f1a010f55e7da6b43ea65550066b1ca7abad0
\ No newline at end of file

diff --git a/src/test_superlock.c b/src/test_superlock.c
index c3e3832216b3d45d26f1f34aeaf1d8613af69ab0..8a49188658d5640a3a813613a3a2ccc81c323e57 100644 (file)
--- a/src/test_superlock.c
+++ b/src/test_superlock.c
@@ -102,7 +102,6 @@ static int superlockWalLock(
   int rc;                         /* Return code */
   sqlite3_file *fd = 0;           /* Main database file handle */
   void volatile *p = 0;           /* Pointer to first page of shared memory */
-  int nBusy = 0;                  /* Number of calls already made to xBusy */
 
   /* Obtain a pointer to the sqlite3_file object open on the main db file. */
   rc = sqlite3_file_control(db, "main", SQLITE_FCNTL_FILE_POINTER, (void *)&fd);
@@ -311,6 +310,7 @@ static int superlock_cmd(
   assert( rc!=SQLITE_OK || pLock!=0 );
 
   if( rc!=SQLITE_OK ){
+    extern const char *sqlite3ErrStr(int);
     Tcl_ResetResult(interp);
     Tcl_AppendResult(interp, sqlite3ErrStr(rc), 0);
     return TCL_ERROR;