]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge va_list misuse fix.
authordrh <>
Wed, 22 Oct 2025 12:59:34 +0000 (12:59 +0000)
committerdrh <>
Wed, 22 Oct 2025 12:59:34 +0000 (12:59 +0000)
FossilOrigin-Name: e33ca68fee5bb6c5195f5a8fef231dcf08433806f5f44b855c2c670d37df6ac7

1  2 
ext/qrf/qrf.c
manifest
manifest.uuid

diff --cc ext/qrf/qrf.c
Simple merge
diff --cc manifest
index c02729265fd05fea3d8dacc52110ca0d00e3728c,c864bcaf588f7dcc966aa5644a55fb5893bf1603..8a59437516326d2565823b6536aaf6b5da72568e
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Refactor:\s\sName\schange\sto\s"query\sresult\sformatter"\sor\s"QRF".\s\sSimplify\snames.\nput\sall\sthe\scode\sinto\sits\sown\ssubdirectory\sof\sext/
- D 2025-10-22T12:33:59.118
 -C Fix\sa\sva_list\smisuse.
 -D 2025-10-22T12:38:39.500
++C Merge\sva_list\smisuse\sfix.
++D 2025-10-22T12:59:34.472
  F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@@ -416,10 -420,6 +416,10 @@@ F ext/misc/wholenumber.c 0fa0c082676b78
  F ext/misc/windirent.h 02211ce51f3034c675f2dbf4d228194d51b3ee05734678bad5106fff6292e60c
  F ext/misc/zipfile.c 09e6e3a3ff40a99677de3c0bc6569bd5f4709b1844ac3d1c1452a456c5a62f1c
  F ext/misc/zorder.c bddff2e1b9661a90c95c2a9a9c7ecd8908afab5763256294dd12d609d4664eee
- F ext/qrf/qrf-tester.c 59cb5b1ed889ba57836d0fbb07b583fdfdfe409b1344f4f119fc13dff3a7356a w ext/misc/resfmt-tester.c
- F ext/qrf/qrf.c 702769f174817330ebe92af2334e5f5529f6f5b6315ace318a359e3a9bde10ac w ext/misc/resfmt.c
- F ext/qrf/qrf.h e9585fbadc45e8182faf208a0f86984d5130d89742364424fd1c39f12457f013 w ext/misc/resfmt.h
- F ext/qrf/qrf.md 4eea619191dab7bbf483eff3fe3b074a07d7c8c50bc86070a4485797d386d1ff w ext/misc/resfmt.md
++F ext/qrf/qrf-tester.c 59cb5b1ed889ba57836d0fbb07b583fdfdfe409b1344f4f119fc13dff3a7356a
++F ext/qrf/qrf.c aea2ed76f530818706ab99cc7b8bddc05725b581116dbfac87428215b65ea49d
++F ext/qrf/qrf.h e9585fbadc45e8182faf208a0f86984d5130d89742364424fd1c39f12457f013
++F ext/qrf/qrf.md 4eea619191dab7bbf483eff3fe3b074a07d7c8c50bc86070a4485797d386d1ff
  F ext/rbu/rbu.c 801450b24eaf14440d8fd20385aacc751d5c9d6123398df41b1b5aa804bf4ce8
  F ext/rbu/rbu1.test 25870dd7db7eb5597e2b4d6e29e7a7e095abf332660f67d89959552ce8f8f255
  F ext/rbu/rbu10.test 7c22caa32c2ff26983ca8320779a31495a6555737684af7aba3daaf762ef3363
@@@ -2175,11 -2175,8 +2175,8 @@@ F tool/version-info.c 33d0390ef484b3b1c
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
--P 82dc13ec4887f90995bd984ede9c2670fb7512962ccceb1848a7e9aab7891c00
- R 876ffc4381d775206ba278a9f63b44f7
- T *branch * qrf
- T *sym-qrf *
- T -sym-resfmt *
 -R fa18e75fe233d98f1fe33dfd9aa9b399
 -U stephan
 -Z 380e5356f88927c6576fb8a521f933af
++P 8646a2ee224819cf459989aa03bd1b9e1a77fc1f8bee8fd45dba778c63467d61 3d044121768548df59a94bbbe4ee360d6464d1416a5cbe7437f4333b06496381
++R a0cefa8d831fc9721f1ccf4dcb767699
 +U drh
- Z c3eafc0dfedaee8eb5b7be16a8347846
++Z a74d0a3608476365ed4fc9d5191c691c
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 42b833f002d149cab02def7fd324218750c6d1ef,6bf1ef421ac8135c3bcd17f985c1a590ee64ea08..6c3f3c2154881a2136feb3450a21f48253e49d08
@@@ -1,1 -1,1 +1,1 @@@
- 8646a2ee224819cf459989aa03bd1b9e1a77fc1f8bee8fd45dba778c63467d61
 -3d044121768548df59a94bbbe4ee360d6464d1416a5cbe7437f4333b06496381
++e33ca68fee5bb6c5195f5a8fef231dcf08433806f5f44b855c2c670d37df6ac7