Mark an unreachable branch using NEVER().

FossilOrigin-Name: fadbc5e23f93bedd705bdc83cd3781b3821a231034bae5b942c94da77227721c

diff --git a/manifest b/manifest
index 18c42ee4e285b6fe2867a30df9b494ab54f9c6f1..815ce0cb709aa9131106ef2589632893e932c350 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sdocumentation\sfor\ssqlite3_serialize()\sand\ssqlite3_deserialize().\nChange\sthe\sname\sof\sthe\scompile-time\soption\sto\senable\sthese\sinterfaces\nfrom\sSQLITE_ENABLE_MEMDB\sto\sSQLITE_ENABLE_DESERIALIZE.
-D 2018-03-06T21:43:19.244
+C Mark\san\sunreachable\sbranch\susing\sNEVER().
+D 2018-03-07T01:37:05.387
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 1d5a68043cc4d8a6e45b37e2639b148cdd7973aa75e90ec71e12d55cd95e32c0
@@ -460,7 +460,7 @@ F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
 F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
 F src/mem3.c 8768ac94694f31ffaf8b4d0ea5dc08af7010a35a
 F src/mem5.c 9bf955937b07f8c32541c8a9991f33ce3173d944
-F src/memdb.c f5d49ef349a07df3b855885c4a0f3d8d688ca9a9c82093e9ed6a399a4826abea
+F src/memdb.c 00ece105cf2cc1fcf0faf8151a1bcde50d19ae99437ee646b0cad457e469a896
 F src/memjournal.c 6f3d36a0a8f72f48f6c3c722f04301ac64f2515435fa42924293e46fc7994661
 F src/msvc.h 4942752b6a253116baaa8de75256c51a459a5e81
 F src/mutex.c b021263554c8a3995e9d53193b8194b96d1ed28e06c3b532dd7f7d29cf0c7d53
@@ -1710,7 +1710,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P b58ca4cb0c921e81efad527c80b220be120263cfdb04528ae26ecf8b8f66f44a
-R 8d936538e4c856e0f588396347b85dcc
+P f07e97aed435b02e1473053c0257ec5c89bf0b3e46076b7a9382de432bbc2497
+R 1be29732572fe3143eab743f97b3559e
 U drh
-Z c61ba7a8db0957766315d0dc5cf0b993
+Z fc974f7768a62ed16a0f51a5a0679333

diff --git a/manifest.uuid b/manifest.uuid
index 6fe0b07e1fcee561643857f4799d8c6df27f772b..0219ff251312fd53dff427f4d2dfa7370a8930de 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f07e97aed435b02e1473053c0257ec5c89bf0b3e46076b7a9382de432bbc2497
\ No newline at end of file
+fadbc5e23f93bedd705bdc83cd3781b3821a231034bae5b942c94da77227721c
\ No newline at end of file

diff --git a/src/memdb.c b/src/memdb.c
index 646f788febcdd326daef134546f2ec12d3339327..320c70865ff328d16b3e6c16a5ecf38241964081 100644 (file)
--- a/src/memdb.c
+++ b/src/memdb.c
@@ -564,7 +564,10 @@ int sqlite3MemdbInit(void){
   sqlite3_vfs *pLower = sqlite3_vfs_find(0);
   int sz = pLower->szOsFile;
   memdb_vfs.pAppData = pLower;
-  if( sz<sizeof(MemFile) ) sz = sizeof(MemFile);
+  /* In all known configurations of SQLite, the size of a default
+  ** sqlite3_file is greater than the size of a memdb sqlite3_file.
+  ** Should that ever change, remove the following NEVER() */
+  if( NEVER(sz<sizeof(MemFile)) ) sz = sizeof(MemFile);
   memdb_vfs.szOsFile = sz;
   return sqlite3_vfs_register(&memdb_vfs, 0);
 }