Remove reachable ALWAYS and NEVER macros.

FossilOrigin-Name: f601de3eeabd85993c1f5ee96b62de6fdabbeae2fe8950e00d08feb48d42c498

diff --git a/manifest b/manifest
index 17837b409398e323b42eb2dc9e1652332b3eb27a..71f63d320e85c461178317de00a3857a928aa9ab 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Two\snew\sNEVER\smacros.
-D 2023-12-04T15:22:42.529
+C Remove\sreachable\sALWAYS\sand\sNEVER\smacros.
+D 2023-12-04T16:01:39.513
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -688,7 +688,7 @@ F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276
-F src/json.c f9628f4dc6cc2ddf26b5edb1c275e80db886634003cead23ec8c7c8db8b4fd04
+F src/json.c 486643d34e35a9d33c88ba13810119eb08edf8f7585378379b2880ab2f20884f
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 F src/main.c 1b89f3de98d1b59fec5bac1d66d6ece21f703821b8eaa0d53d9604c35309f6f9
@@ -2145,8 +2145,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 ae973cb1515f9d76409c92a2ca2ffd6b71f32b0b490a4886770e7c1b90f12611
-R 34754ed91bc896045fb5083333f2e977
+P 52632c92cb06faf0e804654b3490fd6c199521107bd30c8fcbc3a2a5a488098f
+R e34d44ceb9e1b582fec5d492940f4291
 U drh
-Z 8fd37e932957842ac050d54bc05491f1
+Z 6c24af6356a01e718b1f63d8aebe720b
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 7bf52474de4e3b57b62e9e48257ed03007a0d8ff..feb883af6cea8ea5d37036d1a63c5d143fa05464 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-52632c92cb06faf0e804654b3490fd6c199521107bd30c8fcbc3a2a5a488098f
\ No newline at end of file
+f601de3eeabd85993c1f5ee96b62de6fdabbeae2fe8950e00d08feb48d42c498
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index feab5f4dfe70b6f5c05ccaf36cc524d90ed8cebf..10470e62df510c668ace7d2fec4b1163b52fd219 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -2280,7 +2280,7 @@ static u32 jsonLookupStep(
         assert( !pParse->oom );
         nIns = ix.nBlob + nKey + v.nBlob;
         jsonBlobEdit(pParse, j, 0, 0, nIns);
-        if( ALWAYS(!pParse->oom) ){
+        if( !pParse->oom ){
           memcpy(&pParse->aBlob[j], ix.aBlob, ix.nBlob);
           k = j + ix.nBlob;
           memcpy(&pParse->aBlob[k], zKey, nKey);
@@ -2401,7 +2401,7 @@ static void jsonReturnFromBlob(
   sqlite3 *db = sqlite3_context_db_handle(pCtx);
 
   n = jsonbPayloadSize(pParse, i, &sz);
-  if( NEVER(n==0) ) return;
+  if( n==0 ) return;
   switch( pParse->aBlob[i] & 0x0f ){
     case JSONB_NULL: {
       sqlite3_result_null(pCtx);