From: drh <>
Date: Fri, 6 Oct 2023 13:05:42 +0000 (+0000)
Subject: Merge compiler warning fixes from trunk into the jsonb branch.
X-Git-Tag: version-3.45.0~116^2~103
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91f3cd987456997941c88ea67f7a45ac9c7f52d2;p=thirdparty%2Fsqlite.git

Merge compiler warning fixes from trunk into the jsonb branch.

FossilOrigin-Name: 6409d307915f8969f12df2d5ffa961645bd4db7ccfbd6f52237a217b6a867252
---

91f3cd987456997941c88ea67f7a45ac9c7f52d2
diff --cc manifest
index bc4af507a0,21a25b1149..b6d3e12ce0
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Improvements\sto\scoping\swith\smalformed\sJSONB.
- D 2023-10-06T00:06:26.513
 -C Remove\san\sunused\sparameter\sfrom\sthe\srecomputeColumnsNotIndexed()\sroutine\sin\norder\sto\ssquash\sa\sharmless\scompiler\swarning.
 -D 2023-10-06T12:55:53.957
++C Merge\scompiler\swarning\sfixes\sfrom\strunk\sinto\sthe\sjsonb\sbranch.
++D 2023-10-06T13:05:42.465
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -670,7 -670,7 +670,7 @@@ F src/hash.h 3340ab6e1d13e725571d7cee6d
  F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276
- F src/json.c 6758202d3fa30306ae6379c6f995158b0768e1f75e304ff604c1bb498499fcd1
 -F src/json.c c6675e01fcd15b22e7f7189ddc8f98fc32a41adb576a96c0c6268f152e7459a7
++F src/json.c e89b89a6f36b2281524aea01521690e1d3bc69db2754856e4a03ac271f261346
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 98cfba10989b3da6f1807ad42444017742db7f100a54f1032af7a8b1295912c0
  F src/main.c 618aeb399e993cf561864f4b0cf6a331ee4f355cf663635f8d9da3193a46aa40
@@@ -2124,8 -2123,8 +2124,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 6e8e0eedbf06e175af6ef230f1ce9a5ad84698b1c6dcd2794d878c746e7b6be4
- R 0e32d4d167fb477dce553004066d14c6
 -P f3b3d712d6e58b1cb8fdebd2b6b3125080b6b3ac8c7c849a8cc1e5e778d62fe7
 -R 463f7e96293ba99be8baedd81f7591d2
++P 563cde404cec4c6559ae0c5fc5edbc878fee874b36562ce2fac5049cc8349343 9bf4bfd68080367b58594e0d44b110b3ee9766420f648537fd7bc638dacefb72
++R fa6a8cc346d8604b4e2021455b16ba57
  U drh
- Z 0df001ca326ecb2506a99289e47391a0
 -Z 7437dee9dbbbd713eb415ce0acb82a90
++Z 77ed8049621ac72b8ae81ce5801b8fae
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 62b4fee4ff,1325124845..dea74400a2
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 563cde404cec4c6559ae0c5fc5edbc878fee874b36562ce2fac5049cc8349343
 -9bf4bfd68080367b58594e0d44b110b3ee9766420f648537fd7bc638dacefb72
++6409d307915f8969f12df2d5ffa961645bd4db7ccfbd6f52237a217b6a867252