Omit the sqlite3GetReservedNoMutex() routine in build configurations where

it is not used.

FossilOrigin-Name: f193dbb6b96b2f49dd0d6345802c9c006cd99e3c

diff --git a/manifest b/manifest
index 0bf6940ec3a7363e42821402feee4c2b8fff5a2b..8f4fbf72ad8cd8b9e2857587a0eb754d2855d09a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sthe\ssize\sparameter\sto\sread\sand\swrite\sVFS\smethods\sin\sthe\sunix\sVFS\ndo\snot\sbecome\stoo\sbig\sor\sgo\snegative.\s\sThis\swas\snot\sactually\spossible\sin\sthe\ncurrent\scode.\s\sThe\schecks\sare\sadded\sto\smake\ssure\ssome\sfuture\sbug\sdoes\snot\nmake\sit\spossible.
-D 2012-10-01T12:16:26.771
+C Omit\sthe\ssqlite3GetReservedNoMutex()\sroutine\sin\sbuild\sconfigurations\swhere\nit\sis\snot\sused.
+D 2012-10-01T12:44:26.787
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -121,8 +121,8 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c afc067b9a9050ff48b9d46285c53d096c556a73d
 F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
-F src/btree.c 821615a1e1002346d84d2e341ecd5e947196454b
-F src/btree.h 5e6482bcabf39455385e39c9739a5954e4775bba
+F src/btree.c 95ee3c1e788ac1f68d3ffc37b599c811a34c080b
+F src/btree.h 078f76b28c338ab6eb6dd7324d63ee54463aeb6c
 F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621
 F src/build.c c4555e16f8ccdadb2616014c617ed8166c5a93f7
 F src/callback.c 0cb4228cdcd827dcc5def98fb099edcc9142dbcd
@@ -1018,7 +1018,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 6b4ff83bff07d427af585c9fd03be90abf2fc82f
-R 43398c1dd9f4f691234256568baab7a2
+P daebe3bd2d9bd7b6f876a8110cf5045eb3fee078
+R d91a487579faabb2d53225715f6d270e
 U drh
-Z 321bb2af8cac9de7aef8d0d7efaf3889
+Z ba2684210aeb6310a87308d43a7fd6e8

diff --git a/manifest.uuid b/manifest.uuid
index 1db2bb2963c8a20e50b9a0e9c1453bcabe4d2811..7fb135f8f21b38741ac28898c1995a572eb8a41e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-daebe3bd2d9bd7b6f876a8110cf5045eb3fee078
\ No newline at end of file
+f193dbb6b96b2f49dd0d6345802c9c006cd99e3c
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index eff70f3b365ca0c7bfaf17802769812f83f9f261..296469378a456ab09215954bad533ff29a3a6a5d 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -2200,6 +2200,7 @@ int sqlite3BtreeGetPageSize(Btree *p){
   return p->pBt->pageSize;
 }
 
+#if defined(SQLITE_HAS_CODEC) || defined(SQLITE_DEBUG)
 /*
 ** This function is similar to sqlite3BtreeGetReserve(), except that it
 ** may only be called if it is guaranteed that the b-tree mutex is already
@@ -2215,6 +2216,7 @@ int sqlite3BtreeGetReserveNoMutex(Btree *p){
   assert( sqlite3_mutex_held(p->pBt->mutex) );
   return p->pBt->pageSize - p->pBt->usableSize;
 }
+#endif /* SQLITE_HAS_CODEC || SQLITE_DEBUG */
 
 #if !defined(SQLITE_OMIT_PAGER_PRAGMAS) || !defined(SQLITE_OMIT_VACUUM)
 /*

diff --git a/src/btree.h b/src/btree.h
index 5a894f5f22b19b54061938498bda3da6d092fcdd..0efa0cdcdca521f2c78d54725eddda34301039f0 100644 (file)
--- a/src/btree.h
+++ b/src/btree.h
@@ -71,7 +71,9 @@ int sqlite3BtreeMaxPageCount(Btree*,int);
 u32 sqlite3BtreeLastPage(Btree*);
 int sqlite3BtreeSecureDelete(Btree*,int);
 int sqlite3BtreeGetReserve(Btree*);
+#if defined(SQLITE_HAS_CODEC) || defined(SQLITE_DEBUG)
 int sqlite3BtreeGetReserveNoMutex(Btree *p);
+#endif
 int sqlite3BtreeSetAutoVacuum(Btree *, int);
 int sqlite3BtreeGetAutoVacuum(Btree *);
 int sqlite3BtreeBeginTrans(Btree*,int);