Make walIndexTryHdr() a private function. Fix an issue with SQLITE_MUTEX_NOOP.

FossilOrigin-Name: ec65bbd06bdd3bf16a742c5bb1fab0dce756c01a

diff --git a/manifest b/manifest
index da200998d761954979bdfbd174e720d8f659102c..0ad97323512a7223dace4c17be19fe8aec580b1e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Suppress\svarious\scompiler\swarnings.
-D 2010-06-26T21:34:06
+C Make\swalIndexTryHdr()\sa\sprivate\sfunction.\s\sFix\san\sissue\swith\sSQLITE_MUTEX_NOOP.
+D 2010-06-26T22:16:03
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -148,7 +148,7 @@ F src/mem5.c eb7a5cb98915dd7a086fa415ce3a5a0f20d0acff
 F src/memjournal.c 6a81669d6fbf14813992f48a1a0e2bfe57ec66c6
 F src/mutex.c 6949180803ff05a7d0e2b9334a95b4fb5a00e23f
 F src/mutex.h 6fde601e55fa6c3fae768783c439797ab84c87c6
-F src/mutex_noop.c 6bd94a6ccdb40ecfdccd75c0e32469f27d355330
+F src/mutex_noop.c d5cfbca87168c661a0b118cd8e329a908e453151
 F src/mutex_os2.c 6a62583e374ba3ac1a3fcc0da2bfdac7d3942689
 F src/mutex_unix.c cf84466b4fdd2baa0d5a10bb19f08b2abc1ce42e
 F src/mutex_w32.c 1fe0e735897be20e09dd6f53c3fb516c6b48c0eb
@@ -229,7 +229,7 @@ F src/vdbeblob.c 258a6010ba7a82b72b327fb24c55790655689256
 F src/vdbemem.c 5e579abf6532001dfbee0e640dc34eae897a9807
 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
 F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda
-F src/wal.c b6ce9893a4cb33e5af5321a07f9ba8cb82dac13c
+F src/wal.c 7666c113e99fb510ecd3043490798cec5a771e73
 F src/wal.h 4ace25262452d17e7d3ec970c89ee17794004008
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c 1c895bef33d0dfc7ed90fb1f74120435d210ea56
@@ -830,14 +830,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P f149b498b6ada3fc9f71ee104c351554c80c7f8a
-R 35746cb2feca4ef5d81770ea9fb939bf
+P e82d008eaffb5522080cad6c69c1b194b78eadbd
+R 4571797951f4ab0ab98573ca3fe9c307
 U drh
-Z ee43959b6718f1d7aab22b95b6f82fb5
+Z bf87b4bd0a568f47cbc6bbfb396cf7d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMJnJWoxKgR168RlERAvzDAJ4peDc6+SSpn0rLIShVfdyJhUFA1gCfekd0
-CByatwJ6HEWVuZ3SUiyTUTU=
-=ohUG
+iD8DBQFMJnwmoxKgR168RlERAnB3AJ9WmFDjS4Mogutm6tqMf4TXdZMPZQCfcfy3
+WxCV4jYOGkRTKW5Witg+E/w=
+=dfOb
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 84f78d71693779af8d6246152f7e3a42bbe6c5cb..82e2669eb7b0f0c1eabadee87469382d24ffaa70 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e82d008eaffb5522080cad6c69c1b194b78eadbd
\ No newline at end of file
+ec65bbd06bdd3bf16a742c5bb1fab0dce756c01a
\ No newline at end of file

diff --git a/src/mutex_noop.c b/src/mutex_noop.c
index e1e3b3288b27dad0fd8c1b99f07abbd61f673010..c5fd5202c2648885e3483ef521d5de35e065457c 100644 (file)
--- a/src/mutex_noop.c
+++ b/src/mutex_noop.c
@@ -200,7 +200,7 @@ sqlite3_mutex_methods const *sqlite3NoopMutex(void){
 */
 #ifdef SQLITE_MUTEX_NOOP
 sqlite3_mutex_methods const *sqlite3DefaultMutex(void){
-  return sqliteNoopMutex();
+  return sqlite3NoopMutex();
 }
 #endif /* SQLITE_MUTEX_NOOP */
 #endif /* SQLITE_MUTEX_OMIT */

diff --git a/src/wal.c b/src/wal.c
index 3aaf7759c4cb658d9480c9bf2ebb2fe926abe9af..d53223d98597196aa5f0f41f8ddc585442cf8980 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -1671,7 +1671,7 @@ int sqlite3WalClose(
 ** If the checksum cannot be verified return non-zero. If the header
 ** is read successfully and the checksum verified, return zero.
 */
-int walIndexTryHdr(Wal *pWal, int *pChanged){
+static int walIndexTryHdr(Wal *pWal, int *pChanged){
   u32 aCksum[2];                  /* Checksum on the header content */
   WalIndexHdr h1, h2;             /* Two copies of the header content */
   WalIndexHdr volatile *aHdr;     /* Header in shared memory */