Fix a variable-declaration after code problem in btree.c. Harmless in

GCC and CLANG but unacceptable for MSVC.

FossilOrigin-Name: 45abd5c0bad2847861f3b26a7040490aa9bb1332

diff --git a/manifest b/manifest
index 91d323beb877ec1742c00e6826d900a5f6a5b442..f86063d01b5c5097c7c8c03fc740d5cdf6eeea85 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sto\ssqlite3ScratchMalloc()\sthat\smake\sthe\sentire\smemory\sallocation\ninterface\sa\slittle\sfaster\sand\sabout\s100\sbytes\ssmaller.
-D 2014-08-23T19:04:55.170
+C Fix\sa\svariable-declaration\safter\scode\sproblem\sin\sbtree.c.\s\sHarmless\sin\nGCC\sand\sCLANG\sbut\sunacceptable\sfor\sMSVC.
+D 2014-08-23T19:08:09.445
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -168,7 +168,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c a31809c65623cc41849b94d368917f8bb66e6a7e
 F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
 F src/btmutex.c ec9d3f1295dafeb278c3830211cc5584132468f4
-F src/btree.c c4b4e1c9524ba7b7dab840e6f8b29e2379a3bdd2
+F src/btree.c 4737cb5bdb2eb8989cb292f6ff921f7ff45f0c46
 F src/btree.h a79aa6a71e7f1055f01052b7f821bd1c2dce95c8
 F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
 F src/build.c 058e3aadb1376521ff291735237edf4c10f438fb
@@ -1188,7 +1188,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 802148f3110462eac939d53ce08eb9a2f6aac739
-R f2effcc85284cd0fae163c222d4987e9
+P f83daa16f65ef35062412e88c214852a4aeb3da2
+R 964769625a1b08555f23e3f40e4e1b01
 U drh
-Z d2f180c60ae7591aa14ffa4ab8835b4a
+Z 8bbf37cac5a7f4ae4955d0f942660ce9

diff --git a/manifest.uuid b/manifest.uuid
index 233ca9412697638783723ccb7cc403f3d46452f3..948c00a1947393eb8997c8c10e36d7aee920bd5e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f83daa16f65ef35062412e88c214852a4aeb3da2
\ No newline at end of file
+45abd5c0bad2847861f3b26a7040490aa9bb1332
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 23de31db0743e67e0fceb3886a10ba01f73ce28d..384bab218caf5313a7293ed375868845b4717a8e 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -645,9 +645,9 @@ static int SQLITE_NOINLINE saveCursorsOnList(BtCursor*,Pgno,BtCursor*);
 ** event that cursors are in need to being saved.
 */
 static int saveAllCursors(BtShared *pBt, Pgno iRoot, BtCursor *pExcept){
+  BtCursor *p;
   assert( sqlite3_mutex_held(pBt->mutex) );
   assert( pExcept==0 || pExcept->pBt==pBt );
-  BtCursor *p;
   for(p=pBt->pCursor; p; p=p->pNext){
     if( p!=pExcept && (0==iRoot || p->pgnoRoot==iRoot) ) break;
   }