From: drh <drh@noemail.net>
Date: Thu, 6 May 2010 11:56:52 +0000 (+0000)
Subject: Remove the noop-mutex implementations of mutex_held() and mutex_notheld()
X-Git-Tag: version-3.7.2~421
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e404de05c09015590e64d151beda2260ef5ce059;p=thirdparty%2Fsqlite.git

Remove the noop-mutex implementations of mutex_held() and mutex_notheld()
since they are both unreachable.

FossilOrigin-Name: 6767b62a9a063582889f5ceb42f95eab24c697da
---

diff --git a/manifest b/manifest
index 098b33ebf8..e74ffc9ed2 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Add\stwo\stext\sfiles\scontaining\spager\sdesign\snotes\sto\sthe\sdoc/\ssubfolder.
-D 2010-05-06T11:55:57
+C Remove\sthe\snoop-mutex\simplementations\sof\smutex_held()\sand\smutex_notheld()\s\nsince\sthey\sare\sboth\sunreachable.
+D 2010-05-06T11:56:52
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -146,7 +146,7 @@ F src/mem5.c eb7a5cb98915dd7a086fa415ce3a5a0f20d0acff
 F src/memjournal.c f3be374af30588de297dcf678925b2a4758e4135
 F src/mutex.c e2358d8f9a9021ab0bba4d511bb701e471e6e5f6
 F src/mutex.h 6fde601e55fa6c3fae768783c439797ab84c87c6
-F src/mutex_noop.c 3905184c3e1ebc72a5e40f97814dae5b02a33be1
+F src/mutex_noop.c e4942ed01b10f64ebe30cae4d5ad999c534c6c74
 F src/mutex_os2.c 20477db50cf3817c2f1cd3eb61e5c177e50231db
 F src/mutex_unix.c 04a25238abce7e3d06b358dcf706e26624270809
 F src/mutex_w32.c 4cc201c1bfd11d1562810554ff5500e735559d7e
@@ -816,14 +816,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 9465b267d420120c050bbe4f143ac824146a9e4a
-R 089c4fb1e4c5e2af451ed447b05621f8
+P ed817fc893e7162ae0ff4022591f7e9e3b81d622
+R 1cc871189382ddc6b298212ee12ba002
 U drh
-Z 1e94a2049aa9a831f97a2f9882e08469
+Z 71ef84aad0c664aa0a94b1c0e7e9223b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFL4q5RoxKgR168RlERAgnEAJ9AxQEr7Uk8mFQoqD+OX/obdL89jACfTG+r
-XdjbjjPNKUjZXT97fSSLXx4=
-=ENzL
+iD8DBQFL4q6HoxKgR168RlERArtFAJ0YA4njgElyNIjA19j3/e9AUIIBiACaA2tm
+neKsTkrsmECROCVgTmK9o0I=
+=wyXD
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 24dfae9f4d..b45710e716 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ed817fc893e7162ae0ff4022591f7e9e3b81d622
\ No newline at end of file
+6767b62a9a063582889f5ceb42f95eab24c697da
\ No newline at end of file
diff --git a/src/mutex_noop.c b/src/mutex_noop.c
index 9c3cb3ad6c..89a555505d 100644
--- a/src/mutex_noop.c
+++ b/src/mutex_noop.c
@@ -34,8 +34,6 @@
 **
 ** This routines provide no mutual exclusion or error checking.
 */
-static int noopMutexHeld(sqlite3_mutex *p){ return 1; }
-static int noopMutexNotheld(sqlite3_mutex *p){ return 1; }
 static int noopMutexInit(void){ return SQLITE_OK; }
 static int noopMutexEnd(void){ return SQLITE_OK; }
 static sqlite3_mutex *noopMutexAlloc(int id){ return (sqlite3_mutex*)8; }
@@ -54,8 +52,8 @@ sqlite3_mutex_methods *sqlite3NoopMutex(void){
     noopMutexTry,
     noopMutexLeave,
 
-    noopMutexHeld,
-    noopMutexNotheld
+    0,
+    0,
   };
 
   return &sMutex;