Add ALWAYS() to an always-true conditional.

FossilOrigin-Name: fa3506db2051ceade8aa535d92c0900b3cfdd8850c6d00adedeb1ebfaf6f885f

diff --git a/manifest b/manifest
index bd22d0acd5515c605576942125a63fdd0d4d1f8f..141474764a390c91182b938b604ab60b14219966 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\s#ifndef\smacros\sso\sthat\sthe\sbuild\sworks\sagain\swith\n-DSQLITE_OMIT_AUTHORIZATION\sand\s-DSQLITE_OMIT_WINDOWFUNC.
-D 2021-03-01T21:43:25.638
+C Add\sALWAYS()\sto\san\salways-true\sconditional.
+D 2021-03-02T00:42:46.267
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -514,7 +514,7 @@ F src/mem2.c b93b8762ab999a29ae7751532dadf0a1ac78040308a5fb1d17fcc365171d67eb
 F src/mem3.c 30301196cace2a085cbedee1326a49f4b26deff0af68774ca82c1f7c06fda4f6
 F src/mem5.c 9bf955937b07f8c32541c8a9991f33ce3173d944
 F src/memdb.c ab0632d42407e866d2b616bd19d4211ac0ad1b430f04c4e187d60005b8700b98
-F src/memjournal.c bb0533253ad4a9657c29742d8504b6813c8367ccf135c0fb553d786850a55ea9
+F src/memjournal.c 431c70a111223a8a6e2e7e9f014afc6c88d818d357d866afc563195f2277d50e
 F src/msvc.h 3a15918220367a8876be3fa4f2abe423a861491e84b864fb2b7426bf022a28f8
 F src/mutex.c 5e3409715552348732e97b9194abe92fdfcd934cfb681df4ba0ab87ac6c18d25
 F src/mutex.h a7b2293c48db5f27007c3bdb21d438873637d12658f5a0bf8ad025bb96803c4a
@@ -1908,7 +1908,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 39c8686cabe6c437ba4860aade49a701c4f5772b97d9fbe6cb9a394e85b9c092
-R b47568c676eea2742077055be888bea4
+P 9400bdc60294be6a938025d481e50aad9af246e64f38fafecc6ca4f24112a98c
+R 30fcd2895fd27cf2f215c41505bcd0d3
 U drh
-Z 8e481ddbeb4774accb5bf8d02313a8c0
+Z d9cac18b67f324bd9d634b6271bbaffd

diff --git a/manifest.uuid b/manifest.uuid
index 283301f4dac771a7781c1dc17fc44162aae058f0..72fd649f48540f4f1f4b2eae3568800ce3e39397 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9400bdc60294be6a938025d481e50aad9af246e64f38fafecc6ca4f24112a98c
\ No newline at end of file
+fa3506db2051ceade8aa535d92c0900b3cfdd8850c6d00adedeb1ebfaf6f885f
\ No newline at end of file

diff --git a/src/memjournal.c b/src/memjournal.c
index 77cd6db7f3787415e31da4fb5ab787d70b3f9e19..660a842676c9022bf86c440de8ed5a607795f51e 100644 (file)
--- a/src/memjournal.c
+++ b/src/memjournal.c
@@ -267,7 +267,7 @@ static int memjrnlTruncate(sqlite3_file *pJfd, sqlite_int64 size){
     for(pIter=p->pFirst; ALWAYS(pIter) && iOff<=size; pIter=pIter->pNext){
       iOff += p->nChunkSize;
     }
-    if( pIter ){
+    if( ALWAYS(pIter) ){
       memjrnlFreeChunks(pIter->pNext);
       pIter->pNext = 0;
     }