Moved declaration of int nPage; to top of block to silence picky compilers (MSVC...

FossilOrigin-Name: 120bffff747592f1ab6ed02713a712cc74c12528

diff --git a/manifest b/manifest
index 3f5376046f26fc0d8fc668c442c4b362cf7d10c4..29c2b988b99facf7791207758aa5b0f31eec6793 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stest\sfile\sincrblob2.test\sto\stest\sopening\stwo\sblob\shandles\son\sa\ssingle\sdatabase\sblob.\s(CVS\s5196)
-D 2008-06-09T15:51:27
+C Moved\sdeclaration\sof\sint\snPage;\sto\stop\sof\sblock\sto\ssilence\spicky\scompilers\s(MSVC).\s(CVS\s5197)
+D 2008-06-09T19:27:12
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in ce92ea8dc7adfb743757794f51c10d1b0d9c55e4
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -96,7 +96,7 @@ F src/attach.c 496cc628b2e8c4d8db99d7c136761fcbebd8420b
 F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
 F src/bitvec.c ab50c4b8c6a899dae499f5a805eebe4223c78269
 F src/btmutex.c 483ced3c52205b04b97df69161fadbf87f4f1ea2
-F src/btree.c fca8ae92574deb31fe95483cbf1fa185e77c8fd2
+F src/btree.c 0c2c19a9796b5d2cd9f50f6c67559bc923349941
 F src/btree.h b1bd7e0b8c2e33658aaf447cb0d1d94f74664b6b
 F src/btreeInt.h dc04ee33d8eb84714b2acdf81336fbbf6e764530
 F src/build.c a52d9d51341444a2131e3431608f245db80d9591
@@ -592,7 +592,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c c65494ca99d1e09c246dfe37a7ca7a354af9990f
-P e9f01c01866d302d81bf9ebc484ea6351cbc0f60
-R dd9a63ff4b4fc60007b0c2db37c9a684
-U danielk1977
-Z c121a7e48caf86ba6a00e5828d755c0c
+P c1d877feb530b5cdaad55da3dbbb7c2596a10c49
+R 81c98d48a45b9042d962ee079ffcf761
+U shane
+Z 5e9347ffb7b52be63ae88c924696d76b

diff --git a/manifest.uuid b/manifest.uuid
index cd76364c0d99e4eb2aab25136a284fd4dd4154ef..b56f9f1256bfbf26c66c9528c9bb891cf701bade 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c1d877feb530b5cdaad55da3dbbb7c2596a10c49
\ No newline at end of file
+120bffff747592f1ab6ed02713a712cc74c12528
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index f08e7784aa334d50de4af86b8ea2f29d6974b886..969017325a8ed88cba967e50152eabdce1f9808a 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btree.c,v 1.459 2008/06/07 08:58:22 danielk1977 Exp $
+** $Id: btree.c,v 1.460 2008/06/09 19:27:12 shane Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** See the header comment on "btreeInt.h" for additional information.
@@ -4107,8 +4107,8 @@ static int allocateBtreePage(
 
         iPage = get4byte(&aData[8+closest*4]);
         if( !searchList || iPage==nearby ){
-          *pPgno = iPage;
           int nPage;
+          *pPgno = iPage;
           nPage = pagerPagecount(pBt->pPager);
           if( *pPgno>nPage ){
             /* Free page off the end of the file */