From bd8e3d7d0aaea59b5f4427692298879e91ef9060 Mon Sep 17 00:00:00 2001 From: drh <> Date: Fri, 13 Jan 2023 18:20:40 +0000 Subject: [PATCH] Add missing "const" on variables in recent RBU fixes. FossilOrigin-Name: 9b8dcd79050f9bfa745271f51377b38cfed4d8ce41a36b773a30799d69f7b943 --- ext/rbu/sqlite3rbu.c | 4 ++-- manifest | 13 ++++++------- manifest.uuid | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ext/rbu/sqlite3rbu.c b/ext/rbu/sqlite3rbu.c index a1bf3c30b7..2db66f67ac 100644 --- a/ext/rbu/sqlite3rbu.c +++ b/ext/rbu/sqlite3rbu.c @@ -4588,7 +4588,7 @@ static int rbuVfsClose(sqlite3_file *pFile){ sqlite3_free(p->zDel); if( p->openFlags & SQLITE_OPEN_MAIN_DB ){ - sqlite3_io_methods *pMeth = p->pReal->pMethods; + const sqlite3_io_methods *pMeth = p->pReal->pMethods; rbuMainlistRemove(p); rbuUnlockShm(p); if( pMeth->iVersion>1 && pMeth->xShmUnmap ){ @@ -5125,7 +5125,7 @@ static int rbuVfsOpen( rc = pRealVfs->xOpen(pRealVfs, zOpen, pFd->pReal, oflags, pOutFlags); } if( pFd->pReal->pMethods ){ - sqlite3_io_methods *pMeth = pFd->pReal->pMethods; + const sqlite3_io_methods *pMeth = pFd->pReal->pMethods; /* The xOpen() operation has succeeded. Set the sqlite3_file.pMethods ** pointer and, if the file is a main database file, link it into the ** mutex protected linked list of all such files. */ diff --git a/manifest b/manifest index 071177a7fa..902737af5b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Enhance\squery\splanning\sso\sthat\sit\scheck\sfor\ssqlite3_interrupt()\scalls\sand\nperiodically\sinvokes\sthe\sprogress\shandler\scallback\s(if\sany)\sduring\slong\nquery\sanalyses. -D 2023-01-13T15:54:25.723 +C Add\smissing\s"const"\son\svariables\sin\srecent\sRBU\sfixes. +D 2023-01-13T18:20:40.205 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -387,7 +387,7 @@ F ext/rbu/rbuvacuum.test 55e101e90168c2b31df6c9638fe73dc7f7cc666b6142266d1563697 F ext/rbu/rbuvacuum2.test 2643b58f4d8d3573db0f93faae18805a35ab162b4c55ff6b656062ff432ed55b F ext/rbu/rbuvacuum3.test 8addd82e4b83b4c93fa47428eae4fd0dbf410f8512c186f38e348feb49ba03dc F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2f1dbccfd10 -F ext/rbu/sqlite3rbu.c 2f82788e5dc0a40ce92237b85ea89093d471187ed09981c3c228c6315c2f4513 +F ext/rbu/sqlite3rbu.c 348bb6251e6ec459de102f8b2dd50789a98643ef7a28e56e4c787ac9659c15ea F ext/rbu/sqlite3rbu.h 02d981e2d39c151391759e1a400e29c7388730812957ac3db8dad7f6c9f9cfc8 F ext/rbu/test_rbu.c ee6ede75147bc081fe9bc3931e6b206277418d14d3fbceea6fdc6216d9b47055 F ext/recover/dbdata.c dc25628e405c86936c597e28f3e6f56a257029c3034c5ef7f6b10f7c02f41018 @@ -2069,9 +2069,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P c5d958eb942a8d6ea1e6e1d2d57637f9359d518965a28f298c7fbacdb9080f59 41b4c407b7f6968f4493fb9a0b220c55a6f6a353a8e6cb054efd3eb01bdd11dc -R c48cc3fce2e639d8b7f17511d0860c6a -T +closed 41b4c407b7f6968f4493fb9a0b220c55a6f6a353a8e6cb054efd3eb01bdd11dc +P bd8fa10e59f58886e10c84ea9934fa1b5f491aac2eff302757a76d2d36d59b69 +R b0128c6ff9efe26a006547103763567b U drh -Z ce33d829c4c5aabbb58fbd24075e297a +Z 73010cbd896bf55e27536733698725c5 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 25ba762e5f..5e9a1dcd79 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -bd8fa10e59f58886e10c84ea9934fa1b5f491aac2eff302757a76d2d36d59b69 \ No newline at end of file +9b8dcd79050f9bfa745271f51377b38cfed4d8ce41a36b773a30799d69f7b943 \ No newline at end of file