From: drh <drh@noemail.net>
Date: Wed, 9 Mar 2016 02:03:03 +0000 (+0000)
Subject: Add an #ifdef and an ALWAYS() for coverage.
X-Git-Tag: version-3.12.0~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=273021d71a892d8155ad17354e52ce3b743b8c3a;p=thirdparty%2Fsqlite.git

Add an #ifdef and an ALWAYS() for coverage.

FossilOrigin-Name: 069337a922867ad0d023f5bf36e13ea46e047000
---

diff --git a/manifest b/manifest
index 7dcb18c721..7b1d29dc01 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\san\sunreachable\sbranch\sin\sthe\svirtual\stable\squery\splanner\sinto\nan\sassert().
-D 2016-03-08T23:44:48.075
+C Add\san\s#ifdef\sand\san\sALWAYS()\sfor\scoverage.
+D 2016-03-09T02:03:03.758
 F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@ -321,7 +321,7 @@ F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
 F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
 F src/mem3.c 8768ac94694f31ffaf8b4d0ea5dc08af7010a35a
 F src/mem5.c 9bf955937b07f8c32541c8a9991f33ce3173d944
-F src/memjournal.c 02deb8930ae8103fbe5640433a9d55c5dd2c13f1
+F src/memjournal.c 9704b40cd63d53f584ac06c0cd1b52d399bb63ec
 F src/msvc.h d9ba56c6851227ab44b3f228a35f3f5772296495
 F src/mutex.c 8e45800ee78e0cd1f1f3fe8e398853307f4a085c
 F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
@@ -1455,7 +1455,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 4c89c2534abcf67bc486d5a900a84a6c4f59537e
-R ba189513b00cd0d7f1cb51ba2837236b
+P 73b97b9ec3c39ab2828ae6353b5d7e04a27996c9
+R ff350e249f52320a06e1a0030d694c10
 U drh
-Z b92bcbc09edaf6b80c374c7506559755
+Z 4b008537bb55e8cdb449348ac3153700
diff --git a/manifest.uuid b/manifest.uuid
index b773d03caf..1716d33ca2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-73b97b9ec3c39ab2828ae6353b5d7e04a27996c9
\ No newline at end of file
+069337a922867ad0d023f5bf36e13ea46e047000
\ No newline at end of file
diff --git a/src/memjournal.c b/src/memjournal.c
index 2d6922ddeb..706703ed80 100644
--- a/src/memjournal.c
+++ b/src/memjournal.c
@@ -202,10 +202,15 @@ static int memjrnlWrite(
     ** atomic-write optimization. In this case the first 28 bytes of the
     ** journal file may be written as part of committing the transaction. */ 
     assert( iOfst==p->endpoint.iOffset || iOfst==0 );
+#ifdef SQLITE_ENABLE_ATOMIC_WRITE
     if( iOfst==0 && p->pFirst ){
       assert( p->nChunkSize>iAmt );
       memcpy((u8*)p->pFirst->zChunk, zBuf, iAmt);
-    }else{
+    }else
+#else
+    assert( iOfst>0 || p->pFirst==0 );
+#endif
+    {
       while( nWrite>0 ){
         FileChunk *pChunk = p->endpoint.pChunk;
         int iChunkOffset = (int)(p->endpoint.iOffset%p->nChunkSize);
@@ -249,7 +254,7 @@ static int memjrnlWrite(
 */
 static int memjrnlTruncate(sqlite3_file *pJfd, sqlite_int64 size){
   MemJournal *p = (MemJournal *)pJfd;
-  if( size==0 ){
+  if( ALWAYS(size==0) ){
     memjrnlFreeChunks(p);
     p->nSize = 0;
     p->endpoint.pChunk = 0;