Rename the internal routine jsonMergePatchBlob() to just jsonMergePatch().

FossilOrigin-Name: ebf667b616235bb64b83832008342ba5e7b10b2c170d7cebc431f040fef7ecfb

diff --git a/manifest b/manifest
index c1b6b255f5d0e7c2d81f84dd01ce7d8de9dcadcc..db03cd38076a03b62be873409bd21fc4ad9823c0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixes\sto\serror\shandling\sin\sjson_array_length().
-D 2023-12-04T19:32:17.504
+C Rename\sthe\sinternal\sroutine\sjsonMergePatchBlob()\sto\sjust\sjsonMergePatch().
+D 2023-12-04T23:12:57.639
 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 326c7149206251639111f4fe2275f66d50345da0725dec4c617d583a280e969d
+F src/json.c d2385c49df219c1d10cb0a3a817df5aa7bd2ef86772f24f3763e2341b0875b70
 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 66594544f3ba9977475a3e3f74404eb2b2fb845053b28bd24c2b52c7df94e9d7
-R 07c551e152c91bb13fe1d576cd87540a
+P aa85df2d26b74c171c55bde19ef17c4f11f40b8af7181bbf7162f87cdea7e88b
+R 6429070b5e7eb1a8581d28813921879f
 U drh
-Z 0dc2cc057fc8990b916cb29e965f29a3
+Z f2f7e0af6ffb5ce2a2c95b6ed2412ab3
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 2b59f8602aa6a0d494210116a4531d59f42dc317..7301a291e0c5308ace2e345f8215a3e35880871e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-aa85df2d26b74c171c55bde19ef17c4f11f40b8af7181bbf7162f87cdea7e88b
\ No newline at end of file
+ebf667b616235bb64b83832008342ba5e7b10b2c170d7cebc431f040fef7ecfb
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index 6b72d3fdea69313d37d99f49bec7aa631107c729..e0651130ff86bb21ae4388ba7a2c194bb04e3286 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -3243,7 +3243,7 @@ json_extract_error:
 }
 
 /*
-** Return codes for jsonMergePatchBlob()
+** Return codes for jsonMergePatch()
 */
 #define JSON_MERGE_OK          0     /* Success */
 #define JSON_MERGE_BADTARGET   1     /* Malformed TARGET blob */
@@ -3296,7 +3296,7 @@ json_extract_error:
 **  |
 **  ^---- Line numbers referenced in comments in the implementation
 */
-static int jsonMergePatchBlob(
+static int jsonMergePatch(
   JsonParse *pTarget,      /* The JSON parser that contains the TARGET */
   u32 iTarget,             /* Index of TARGET in pTarget->aBlob[] */
   const JsonParse *pPatch, /* The PATCH */
@@ -3427,7 +3427,7 @@ static int jsonMergePatchBlob(
         /* Algorithm line 12 */
         int rc, savedDelta = pTarget->delta;
         pTarget->delta = 0;
-        rc = jsonMergePatchBlob(pTarget, iTValue, pPatch, iPValue);
+        rc = jsonMergePatch(pTarget, iTValue, pPatch, iPValue);
         if( rc ) return rc;
         pTarget->delta += savedDelta;
       }        
@@ -3448,7 +3448,7 @@ static int jsonMergePatchBlob(
         pTarget->aBlob[iTEnd+szNew] = 0x00;
         savedDelta = pTarget->delta;
         pTarget->delta = 0;
-        rc = jsonMergePatchBlob(pTarget, iTEnd+szNew,pPatch,iPValue);
+        rc = jsonMergePatch(pTarget, iTEnd+szNew,pPatch,iPValue);
         if( rc ) return rc;
         pTarget->delta += savedDelta;
       }
@@ -3479,7 +3479,7 @@ static void jsonPatchFunc(
   if( pTarget==0 ) return;
   pPatch = jsonParseFuncArg(ctx, argv[1], 0);
   if( pPatch ){
-    rc = jsonMergePatchBlob(pTarget, 0, pPatch, 0);
+    rc = jsonMergePatch(pTarget, 0, pPatch, 0);
     if( rc==JSON_MERGE_OK ){
       jsonReturnParse(ctx, pTarget);
     }else if( rc==JSON_MERGE_OOM ){