From 7fb25459056b6d99e860d2502b00252ddae67980 Mon Sep 17 00:00:00 2001 From: stephan Date: Thu, 30 Oct 2025 18:46:03 +0000 Subject: [PATCH] Add (void) to two places for the sake of SQLITE_OMIT_WAL builds. Why these do not complain on tests in this tree, but do on a downstream tree (same machine, same compiler), is a mystery. FossilOrigin-Name: dd6edfc09434b0d170d5ab462053497043016a4ec6b91a46db565ccf646aee20 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/wal.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 415f5e1a66..1d3c961a8c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C wasm:\sre-add\sSQLITE_OMIT_WAL\sto\sthe\sc-pp-lite\sbuild\sflags. -D 2025-10-30T18:39:28.154 +C Add\s(void)\sto\stwo\splaces\sfor\sthe\ssake\sof\sSQLITE_OMIT_WAL\sbuilds.\sWhy\sthese\sdo\snot\scomplain\son\stests\sin\sthis\stree,\sbut\sdo\son\sa\sdownstream\stree\s(same\smachine,\ssame\scompiler),\sis\sa\smystery. +D 2025-10-30T18:46:03.639 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -814,7 +814,7 @@ F src/vdbetrace.c 49e689f751505839742f4a243a1a566e57d5c9eaf0d33bbaa26e2de3febf7b F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3 F src/vtab.c 828221bdbeaaa6d62126ee6d07fd4ec0d09dcaea846f87ad01944d8b7e548859 F src/vxworks.h 9d18819c5235b49c2340a8a4d48195ec5d5afb637b152406de95a9436beeaeab -F src/wal.c 6bebee1a33f8b3b656de1bfa529513a2268584562b0bb8ff9c69cefba2506deb +F src/wal.c 505a98fbc599a971d92cb90371cf54546c404cd61e04fd093e7b0c8ff978f9b6 F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452 F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014 F src/where.c 7d17cd5cb883b2166097957e20c4aab2d0d98e0c1141002ef77b5f6b9deed844 @@ -2171,8 +2171,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P c31a944680f18a799c763238dbb0561f8b039905ce442533258905219b33b743 -R 80085560c53e8f40fafe5fae33b3e98c +P 617f8ac40e073c3fdc1144639b78617ad61113f4e873fc20c99399d2b60e1ceb +R 6658ffc3f7aabffe6f81543b514c59bc U stephan -Z b003aa7839ffaf7118a3de9b8380e81d +Z e6049977c01328ee76221cb2c7d03ac4 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 5b8c12a784..3267d521bf 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -617f8ac40e073c3fdc1144639b78617ad61113f4e873fc20c99399d2b60e1ceb +dd6edfc09434b0d170d5ab462053497043016a4ec6b91a46db565ccf646aee20 diff --git a/src/wal.c b/src/wal.c index a74525b7be..0698521586 100644 --- a/src/wal.c +++ b/src/wal.c @@ -3488,7 +3488,7 @@ void sqlite3WalEndReadTransaction(Wal *pWal){ assert( pWal->writeLock==0 || pWal->readLock<0 ); #endif if( pWal->readLock>=0 ){ - sqlite3WalEndWriteTransaction(pWal); + (void)sqlite3WalEndWriteTransaction(pWal); walUnlockShared(pWal, WAL_READ_LOCK(pWal->readLock)); pWal->readLock = -1; } @@ -4395,7 +4395,7 @@ int sqlite3WalCheckpoint( sqlite3WalDb(pWal, 0); /* Release the locks. */ - sqlite3WalEndWriteTransaction(pWal); + (void)sqlite3WalEndWriteTransaction(pWal); if( pWal->ckptLock ){ walUnlockExclusive(pWal, WAL_CKPT_LOCK, 1); pWal->ckptLock = 0; -- 2.47.3