diff --git a/manifest b/manifest index f51fabc913..2d2561832d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Improved\srobustness\sof\sthe\s"showdb"\sdebugging\sprogram\swhen\sit\sis\sparsing\ncorrupt\sdatabase\sfiles. -D 2021-04-26T23:57:02.468 +C Better\serror\smessages\son\sshowdb. +D 2021-04-27T00:05:03.863 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -1864,7 +1864,7 @@ F tool/replace.tcl 60f91e8dd06ab81f74d213ecbd9c9945f32ac048 F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5 F tool/run-speed-test.sh f95d19fd669b68c4c38b6b475242841d47c66076 -F tool/showdb.c d99bd18f8386fd83f8236b1c367e464a6d58e65681f2de25856dfa5076fa67cb +F tool/showdb.c 8c6b1cbb86ee25ca2173497183f8fcd444d4e26923e4cf57ddabe66c633b4dab F tool/showjournal.c 5bad7ae8784a43d2b270d953060423b8bd480818 F tool/showlocks.c 9cc5e66d4ebbf2d194f39db2527ece92077e86ae627ddd233ee48e16e8142564 F tool/showshm.c a0ab6ec32dd1f11218ca2a4018f8fb875b59414801ab8ceed8b2e69b7b45a809 @@ -1914,7 +1914,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 88d20500c516fe89ad1cd42f7366ca190c3790f911f11ab332b86b675f5f69ba -R a7a438a7a1e4a8c7f93ba3c58bbec3f4 +P 3eabac2ee50fd70b22a927d3d2934718a15e1f666d8d271b854579156c8b01de +R 6fea783c7cee361a6851786be6d6a280 U drh -Z 323bfb66712236d14601f16d2826d127 +Z 6b8049099c18bf9fc8a3db324724e010 diff --git a/manifest.uuid b/manifest.uuid index 1cf0c55c7a..28a0d53101 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3eabac2ee50fd70b22a927d3d2934718a15e1f666d8d271b854579156c8b01de \ No newline at end of file +7e18e114b245d17aa259ea9ab42752ccc9ad5303bbac8d8e46928dd10319f545 \ No newline at end of file diff --git a/tool/showdb.c b/tool/showdb.c index b4b751e588..5e949939e1 100644 --- a/tool/showdb.c +++ b/tool/showdb.c @@ -917,12 +917,12 @@ static void page_usage_btree( cellidx = cellstart + i*2; if( cellidx+1 >= g.pagesize ){ - page_usage_msg(pgno, "too many cells"); + printf("ERROR: page %d too many cells (%d)\n", pgno, nCell); break; } ofst = a[cellidx]*256 + a[cellidx+1]; if( ofst=g.pagesize ){ - page_usage_msg(pgno, "cell %d out of bounds", i); + printf("ERROR: page %d cell %d out of bounds\n", pgno, i); continue; } child = decodeInt32(a+ofst);