From: drh <> Date: Fri, 2 Sep 2022 19:18:49 +0000 (+0000) Subject: Remove a NEVER() that is sometimes true. X-Git-Tag: version-3.39.3~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8b45c33cdb7661e59e69070e1c89b08ccadcfa9;p=thirdparty%2Fsqlite.git Remove a NEVER() that is sometimes true. FossilOrigin-Name: 85a8a117402737352d0c36e9f24a9bdb3842b34f1c520db2d37a2fc91b026486 --- diff --git a/manifest b/manifest index 7249fa1798..3d2b6c1e94 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\san\sassert()\sassociated\swith\sthe\sdbsqlfuzz\serror\sat\s[8372468bb5d8922c]. -D 2022-09-02T17:26:22.598 +C Remove\sa\sNEVER()\sthat\sis\ssometimes\strue. +D 2022-09-02T19:18:49.400 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -557,7 +557,7 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586 F src/os_unix.c e020676e334a0a78c3affb7dd1789a240071ed6af98309f1bef76948cb8382bd F src/os_win.c d55025aeb5b36b5d92d7c09fe709edaf2be901420782540ba4adad86729636a0 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a -F src/pager.c 74596fc3d5d8a50de32c37225fc300cccd5ea27ea303c5f4b845d6572f999c5f +F src/pager.c 5fb5b09afddfdfb19e0245bd9b2c1396fa70cf288f5aaa36045266faeec5eabb F src/pager.h f82e9844166e1585f5786837ddc7709966138ced17f568c16af7ccf946c2baa3 F src/parse.y 8e67d820030d2655b9942ffe61c1e7e6b96cea2f2f72183533299393907d0564 F src/pcache.c 084e638432c610f95aea72b8509f0845d2791293f39d1b82f0c0a7e089c3bb6b @@ -1978,9 +1978,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 073621afa2fd833a3ee976d7508a11eca67520e1bc6d5351654fa220c9397976 -Q +54251f81ebc43839cc97f91d2df4c320c1b96b5690cc11ce45b60c087c9becd6 -R 22775315e6043591e04ec368aeb06a9f +P f448480e1b93d94ee852b252df6e2fd8649a08f78ab294b07f77307ac0821beb +R 667086c6f8e21a55555e415d25ef3c13 U drh -Z 95f81d7c73f2dccb22b437f63cf3c738 +Z 5ac3ebbcd7ca50918bdf25de3685ae64 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index facf55d46d..62909d9867 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f448480e1b93d94ee852b252df6e2fd8649a08f78ab294b07f77307ac0821beb \ No newline at end of file +85a8a117402737352d0c36e9f24a9bdb3842b34f1c520db2d37a2fc91b026486 \ No newline at end of file diff --git a/src/pager.c b/src/pager.c index 95e6eb8af1..7d93d42d29 100644 --- a/src/pager.c +++ b/src/pager.c @@ -7376,7 +7376,7 @@ int sqlite3PagerGetJournalMode(Pager *pPager){ int sqlite3PagerOkToChangeJournalMode(Pager *pPager){ assert( assert_pager_state(pPager) ); if( pPager->eState>=PAGER_WRITER_CACHEMOD ) return 0; - if( NEVER(isOpen(pPager->jfd) && pPager->journalOff>0) ) return 0; + if( isOpen(pPager->jfd) && pPager->journalOff>0 ) return 0; return 1; }