Fix frame number computation in the log generated by tmstmpvfs.c.

FossilOrigin-Name: 57fda9dd85f0de8c5d4a4d8015e67982d73ab96ad6f1cd590a48d8995dc28140

diff --git a/ext/misc/tmstmpvfs.c b/ext/misc/tmstmpvfs.c
index 9d84a7e6b3a2e45eef267ce07f6d58253151efff..bd14dc3018a7ff1b37a2cad7e85b48707cd2d4cc 100644 (file)
--- a/ext/misc/tmstmpvfs.c
+++ b/ext/misc/tmstmpvfs.c
@@ -536,7 +536,7 @@ static int tmstmpRead(
    && p->inCkpt
    && iAmt>=512 && iAmt<=65535 && (iAmt&(iAmt-1))==0
   ){
-    p->pPartner->iFrame = (iOfst - 8)/(p->pgsz + 48) + 1;
+    p->pPartner->iFrame = (iOfst-56)/(p->pgsz+24) + 1;
   }
   return rc;
 }
@@ -559,7 +559,7 @@ static int tmstmpWrite(
     if( iAmt==24 ){
       /* A frame header */
       u32 x = 0;
-      p->iFrame = (iOfst - 32)/(p->pgsz+24);
+      p->iFrame = (iOfst - 32)/(p->pgsz+24)+1;
       p->pgno = tmstmpGetU32((const u8*)zBuf);
       p->salt1 = tmstmpGetU32(((const u8*)zBuf)+8);
       memcpy(&x, ((const u8*)zBuf)+4, 4);

diff --git a/manifest b/manifest
index eb1427c061f697f3a76437af9d208c82f466dd62..7ec9b3449a0e2b35961979f8bb0a2a5040e2b221 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhancements\sto\stmstmpvfs.c:\s\s(1)\sUse\sthe\sexact\ssame\stimestamp\son\slogfile\nentries\sas\son\sthe\spages\sthat\scontrol,\swhere\sappropriate.\s\s(2)\sInclude\sthe\nWAL\sframe\snumber\sin\sELOG_CKPT_PAGE\slogfile\sentries.
-D 2026-01-26T21:20:28.044
+C Fix\sframe\snumber\scomputation\sin\sthe\slog\sgenerated\sby\stmstmpvfs.c.
+D 2026-01-27T11:19:49.385
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -403,7 +403,7 @@ F ext/misc/sqlite3_stdio.h 27a4ecea47e61bc9574ccdf2806f468afe23af2f95028c9b689bf
 F ext/misc/stmt.c b090086cd6bd6281c21271d38d576eeffe662f0e6b67536352ce32bbaa438321
 F ext/misc/stmtrand.c 59cffa5d8e158943ff1ce078956d8e208e8c04e67307e8f249dece2436dcb7fc
 F ext/misc/templatevtab.c 10f15b165b95423ddef593bc5dcb915ec4eb5e0f1066d585e5435a368b8bc22b
-F ext/misc/tmstmpvfs.c 38729ed49c8c861d00039c739e49fcbf106999715301034293d6c5d5ad93d4b0
+F ext/misc/tmstmpvfs.c 1bb804100d759ab4e9b9c159c3acaf17a5fe18338e72405d24d9f37ef5dccb1e
 F ext/misc/totype.c ba11aac3c0b52c685bd25aa4e0f80c41c624fb1cc5ab763250e09ddc762bc3a8
 F ext/misc/uint.c 327afc166058acf566f33a15bf47c869d2d3564612644d9ff81a23efc8b36039
 F ext/misc/unionvtab.c 716d385256d5fb4beea31b0efede640807e423e85c9784d21d22f0cce010a785
@@ -2193,8 +2193,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P bace9de67db426017d98f31685da1fc6ab10c7755681a41ca978cc97cb2ad5df
-R bbdfd6a9f2325eda1b10caf330c1cb97
+P fcf16297850abf5186b0d414b4f31d4b515925ef5cca5e7d7d84984c26160d00
+R 2c2d3cabed9084db11b18b51926b8e75
 U drh
-Z ce744164aacfa3eae592a40fba323d9b
+Z 02fec7b49f36372491b3d2810e741abd
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index b1bf11cc32befccdc0102c29a8fc890a97d5a84b..5691e1bae950e74b6ca85eb1682f09b02b901f83 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fcf16297850abf5186b0d414b4f31d4b515925ef5cca5e7d7d84984c26160d00
+57fda9dd85f0de8c5d4a4d8015e67982d73ab96ad6f1cd590a48d8995dc28140