From a71a98df88e5b2505db6319e450eb8916cab24a5 Mon Sep 17 00:00:00 2001 From: drh Date: Wed, 11 Jan 2012 16:16:08 +0000 Subject: [PATCH] Remove code made unreachable by the enhancement of the previous check-in. FossilOrigin-Name: 9e31a275ef494ea8713a1d60a15b84157e57c3ff --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/pager.c | 4 ---- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index d33d37f3b3..97da04f66c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\sthe\spager\sless\svulnerable\sto\sproblems\scaused\sby\sshifting\ssector\ssizes\nwhen\srolling\sback\sa\shot\sjournal. -D 2012-01-11T15:47:42.245 +C Remove\scode\smade\sunreachable\sby\sthe\senhancement\sof\sthe\sprevious\scheck-in. +D 2012-01-11T16:16:08.656 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -168,7 +168,7 @@ F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440 F src/os_unix.c 657672fab2580a84116c140b36ee3d6b6fc75b4e F src/os_win.c 5ac061ae1326a71500cee578ed0fd9113b4f6a37 -F src/pager.c a3ef71cb0b8660d79bbc6a72c7e81ca36cc2bf6f +F src/pager.c 4d58c983d9f4d34bc2d48e4280361ccaeecd03c5 F src/pager.h 5cd760857707529b403837d813d86b68938d6183 F src/parse.y fabb2e7047417d840e6fdb3ef0988a86849a08ba F src/pcache.c f8043b433a57aba85384a531e3937a804432a346 @@ -986,7 +986,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 -P 3013f9a67cc6097c14e40a6155c1401f51f4da78 -R d8b430b1632b38746b734caf871f0ff0 +P 629108c8e5376f989cd66e11437949a54c33a5b8 +R 0e3f2b6eff759aa9860b31ea731b9403 U drh -Z 899c0fed1d7782ced9fe8db2345743d3 +Z 39b800b2fc63936bd07e49ea34b13ab2 diff --git a/manifest.uuid b/manifest.uuid index 4ecdd6c5a8..0568c3c8a9 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -629108c8e5376f989cd66e11437949a54c33a5b8 \ No newline at end of file +9e31a275ef494ea8713a1d60a15b84157e57c3ff \ No newline at end of file diff --git a/src/pager.c b/src/pager.c index af8ba697ad..6f3b651668 100644 --- a/src/pager.c +++ b/src/pager.c @@ -2489,7 +2489,6 @@ static int pager_truncate(Pager *pPager, Pgno nPage){ }else if( (currentSize+szPage)<=newSize ){ char *pTmp = pPager->pTmpSpace; memset(pTmp, 0, szPage); - testcase( (newSize-szPage) < currentSize ); testcase( (newSize-szPage) == currentSize ); testcase( (newSize-szPage) > currentSize ); rc = sqlite3OsWrite(pPager->fd, pTmp, szPage, newSize-szPage); @@ -3089,9 +3088,6 @@ static int pagerPagecount(Pager *pPager, Pgno *pnPage){ } } nPage = (Pgno)((n+pPager->pageSize-1) / pPager->pageSize); - if( nPage==0 && n>0 ){ - nPage = 1; - } } /* If the current number of pages in the file is greater than the -- 2.47.2