Fix harmless compiler warnings in the new json_merge_patch() logic.

FossilOrigin-Name: 5d2cf5a2f8afd88d041d89b3936042ce5a43629d23c48738cb2791b24da3e6af

diff --git a/ext/misc/json1.c b/ext/misc/json1.c
index f03bdc6652bfc0041d4fa0c4339817d5dbf0985b..31e03d1e7d0c22eab4d0a7ec16247f25ab1aef2b 100644 (file)
--- a/ext/misc/json1.c
+++ b/ext/misc/json1.c
@@ -1363,8 +1363,8 @@ static JsonNode *jsonMergePatch(
   int iTarget,         /* Node of the TARGET in pParse */
   JsonNode *pPatch     /* The PATCH */
 ){
-  int i, j;
-  int iRoot;
+  u32 i, j;
+  u32 iRoot;
   JsonNode *pTarget;
   if( pPatch->eType!=JSON_OBJECT ){
     return pPatch;

diff --git a/manifest b/manifest
index 31881bdb35239e123f1139bc69c4b7916685c912..a21f45f4f115ef271472b2577f2f10e2c8a7b692 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Various\sfixes\sto\sthe\sjson_merge_patch()\sfunction.
-D 2017-03-23T00:13:52.903
+C Fix\sharmless\scompiler\swarnings\sin\sthe\snew\sjson_merge_patch()\slogic.
+D 2017-03-23T00:46:15.319
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 1faf9f06aadc9284c212dea7bbc7c0dea7e8337f0287c81001eff500912c790a
@@ -218,7 +218,7 @@ F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2
 F ext/misc/fileio.c d4171c815d6543a9edef8308aab2951413cd8d0f
 F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25
 F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
-F ext/misc/json1.c 8a8ba23a0715858ff393aa890e379912759712518afa4d28de6308a79287cb61
+F ext/misc/json1.c bae7cfb49cda81be573fb159919b502a906940ccc1688dbaab33688489c9cf26
 F ext/misc/memvfs.c e5225bc22e79dde6b28380f3a068ddf600683a33
 F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
 F ext/misc/percentile.c 92699c8cd7d517ff610e6037e56506f8904dae2e
@@ -1568,7 +1568,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 53bf70f37bbca319ea35f70849e2a34ae628a504486158fdad5c4bb7431c68e0
-R 7c38ec8ac02c81967ed35b7b062ffaf6
+P f49fd2554b0723eb7cf2fd765d655c6820833ee7e5f7d7629d98c27a6fffa1d9
+R b4e56917a91a0ee0d4fc1a8a4b3db16b
 U drh
-Z e95ab9d86e57fcad88a27a5fb020f800
+Z 39d1ac0a1922cab73356f035d8da0baa

diff --git a/manifest.uuid b/manifest.uuid
index 23d86ab688f6ebe1ab17f59c56ef9ddd4312616a..19e8a627a76d8adda4d0ceab9bbdb54b17f2f97d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f49fd2554b0723eb7cf2fd765d655c6820833ee7e5f7d7629d98c27a6fffa1d9
\ No newline at end of file
+5d2cf5a2f8afd88d041d89b3936042ce5a43629d23c48738cb2791b24da3e6af
\ No newline at end of file