From 79d3714f2472f33b71db8ea8f58f201e7810d085 Mon Sep 17 00:00:00 2001 From: stephan Date: Thu, 24 Oct 2024 07:44:13 +0000 Subject: [PATCH 1/2] Beginnings of rephrasing #if SQLITE_CORE to #ifdef/ifndef for consistency, as discussed in [forum:cea40371c5e34b09 | forum post cea40371c5e34b09]. FossilOrigin-Name: 58d91abf0c5a7712f27783640ef628681de18be5007020d6d8b362dd5a392eda --- ext/icu/icu.c | 2 +- ext/rtree/rtree.c | 2 +- manifest | 19 +++++++++++-------- manifest.uuid | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/ext/icu/icu.c b/ext/icu/icu.c index 69867bfa83..50110072b5 100644 --- a/ext/icu/icu.c +++ b/ext/icu/icu.c @@ -571,7 +571,7 @@ int sqlite3IcuInit(sqlite3 *db){ return rc; } -#if !SQLITE_CORE +#ifndef SQLITE_CORE #ifdef _WIN32 __declspec(dllexport) #endif diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c index 299b5b54b9..6efa20d162 100644 --- a/ext/rtree/rtree.c +++ b/ext/rtree/rtree.c @@ -4449,7 +4449,7 @@ int sqlite3_rtree_query_callback( ); } -#if !SQLITE_CORE +#ifndef SQLITE_CORE #ifdef _WIN32 __declspec(dllexport) #endif diff --git a/manifest b/manifest index 35446e6e5b..fdd326e3d1 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Reorder\sconditions\sin\ssqlite3PagerDirectReadOk()\sfor\scoverage. -D 2024-10-23T11:33:56.073 +C Beginnings\sof\srephrasing\s#if\sSQLITE_CORE\sto\s#ifdef/ifndef\sfor\sconsistency,\sas\sdiscussed\sin\s[forum:cea40371c5e34b09\s|\sforum\spost\scea40371c5e34b09]. +D 2024-10-24T07:44:13.131 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -261,7 +261,7 @@ F ext/fts5/tool/loadfts5.tcl 95b03429ee6b138645703c6ca192c3ac96eaf093 F ext/fts5/tool/mkfts5c.tcl 6649ed963a9135e36866f7cc9f8de5c8dcec85b5df089388274cee6381702cb7 F ext/fts5/tool/showfts5.tcl d54da0e067306663e2d5d523965ca487698e722c F ext/icu/README.txt 7ab7ced8ae78e3a645b57e78570ff589d4c672b71370f5aa9e1cd7024f400fc9 -F ext/icu/icu.c 3add8197e0a86c1761771a39500ebae749438bcf1836160b407a56b4eaa8721c +F ext/icu/icu.c 9837f4611915baad1edbe38222f3ee7d1b5e118ab16fec9ba603720f72c78b2a F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a32075a8 F ext/intck/intck1.test f3a3cba14b6aeff145ffa5515546dd22f7510dad91512e519f43b92b56514012 F ext/intck/intck2.test d2457c7e5e5b688046d15ebe08a1e1427cc5e7a6dc8d6af215f42e8bcaf67304 @@ -525,7 +525,7 @@ F ext/repair/test/checkindex01.test b530f141413b587c9eb78ff734de6bb79bc3515c3350 F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761 F ext/rtree/geopoly.c 0dd4775e896cee6067979d67aff7c998e75c2c9d9cd8d62a1a790c09cde7adca -F ext/rtree/rtree.c b6133dba5ae331fa6c1fc34df6aa623eba951b05ac35116f954a0bf7ab550436 +F ext/rtree/rtree.c e002d8c58bf128d812db662ecc72b61c00ff14408ec807e103d5312a6d29817a F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412 F ext/rtree/rtree1.test e0608db762b2aadca0ecb6f97396cf66244490adc3ba88f2a292b27be3e1da3e F ext/rtree/rtree2.test 9d9deddbb16fd0c30c36e6b4fdc3ee3132d765567f0f9432ee71e1303d32603d @@ -2219,8 +2219,11 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 987b96aa636c1801f87d3e1c75d34d45c5b6f437bcc6d150298675447ed16b5d -R 83c78bc9e17ebe61e54351f39cf78374 -U drh -Z cf7f2e26bfd189f11890320a8c9dc42f +P da9124fee28c155c4d1cc0d3949eb7b588a7236c12883a010af7909ad8e534ef +R 2ebdab3edb1350dc11d4104c859d9548 +T *branch * ifdef-SQLITE_CORE +T *sym-ifdef-SQLITE_CORE * +T -sym-trunk * Cancelled\sby\sbranch. +U stephan +Z b84db1ac2ea5639b2aff4682b7058a21 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 612129bdfe..34c437fa03 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -da9124fee28c155c4d1cc0d3949eb7b588a7236c12883a010af7909ad8e534ef +58d91abf0c5a7712f27783640ef628681de18be5007020d6d8b362dd5a392eda From ed959dba7df5b398ac8c576b123624db29fdb7f3 Mon Sep 17 00:00:00 2001 From: stephan Date: Thu, 24 Oct 2024 15:57:29 +0000 Subject: [PATCH 2/2] Add missing ZERO_ARGUMENT_GENERATE_SERIES checks to ext/misc/series.c, as reported via support mail. FossilOrigin-Name: cd82e4c0f5f8ff16468b909d84dd5545c0456f624db61a4d112467a7cafed2fc --- ext/misc/series.c | 6 ++++++ manifest | 15 ++++++--------- manifest.uuid | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ext/misc/series.c b/ext/misc/series.c index faf8fd0306..64f3be2c05 100644 --- a/ext/misc/series.c +++ b/ext/misc/series.c @@ -667,7 +667,9 @@ static int seriesBestIndex( idxNum &= ~0x3300; aIdx[5] = i; aIdx[6] = -1; +#ifndef ZERO_ARGUMENT_GENERATE_SERIES bStartSeen = 1; +#endif break; } case SQLITE_INDEX_CONSTRAINT_GE: { @@ -675,7 +677,9 @@ static int seriesBestIndex( idxNum |= 0x0100; idxNum &= ~0x0200; aIdx[5] = i; +#ifndef ZERO_ARGUMENT_GENERATE_SERIES bStartSeen = 1; +#endif break; } case SQLITE_INDEX_CONSTRAINT_GT: { @@ -683,7 +687,9 @@ static int seriesBestIndex( idxNum |= 0x0200; idxNum &= ~0x0100; aIdx[5] = i; +#ifndef ZERO_ARGUMENT_GENERATE_SERIES bStartSeen = 1; +#endif break; } case SQLITE_INDEX_CONSTRAINT_LE: { diff --git a/manifest b/manifest index fdd326e3d1..d87ba54555 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Beginnings\sof\srephrasing\s#if\sSQLITE_CORE\sto\s#ifdef/ifndef\sfor\sconsistency,\sas\sdiscussed\sin\s[forum:cea40371c5e34b09\s|\sforum\spost\scea40371c5e34b09]. -D 2024-10-24T07:44:13.131 +C Add\smissing\sZERO_ARGUMENT_GENERATE_SERIES\schecks\sto\sext/misc/series.c,\sas\sreported\svia\ssupport\smail. +D 2024-10-24T15:57:29.106 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -424,7 +424,7 @@ F ext/misc/regexp.c 4bdd0045912f81c84908bd535ec5ad3b1c8540b4287c70ab840709636240 F ext/misc/remember.c add730f0f7e7436cd15ea3fd6a90fd83c3f706ab44169f7f048438b7d6baa69c F ext/misc/rot13.c 51ac5f51e9d5fd811db58a9c23c628ad5f333c173f1fc53c8491a3603d38556c F ext/misc/scrub.c 2a44b0d44c69584c0580ad2553f6290a307a49df4668941d2812135bfb96a946 -F ext/misc/series.c 596afbfbbc81ccf4ea6da11f016f7eed630ed195b5e9d548117e19f06d63f641 +F ext/misc/series.c ea604a16f9c5f7e09ccff3f18d94f2c3a6fa24ca08856156823d981873b8143c F ext/misc/sha1.c cb5002148c2661b5946f34561701e9105e9d339b713ec8ac057fd888b196dcb9 F ext/misc/shathree.c 1821d90a0040c9accdbe3e3527d378d30569475d758aa70f6848924c0b430e8c F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52 @@ -2219,11 +2219,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P da9124fee28c155c4d1cc0d3949eb7b588a7236c12883a010af7909ad8e534ef -R 2ebdab3edb1350dc11d4104c859d9548 -T *branch * ifdef-SQLITE_CORE -T *sym-ifdef-SQLITE_CORE * -T -sym-trunk * Cancelled\sby\sbranch. +P 58d91abf0c5a7712f27783640ef628681de18be5007020d6d8b362dd5a392eda +R 03696d3fcf9d4a87c6a7add90a199e32 U stephan -Z b84db1ac2ea5639b2aff4682b7058a21 +Z 544a28ed9fdb6c5e441dfb7f96432068 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 34c437fa03..13cd48faa5 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -58d91abf0c5a7712f27783640ef628681de18be5007020d6d8b362dd5a392eda +cd82e4c0f5f8ff16468b909d84dd5545c0456f624db61a4d112467a7cafed2fc