Minor simplifications to the "zeroPage()" routine in btree.c.

FossilOrigin-Name: cc8f10bcb206c9def69b06f26decf025b8d9119d

diff --git a/manifest b/manifest
index fd4cbee264fe466382a41df501df7f9c0f3b3553..e344356edb5a146091da06540b5cbc17faffa762 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\s"rowid\scache"\sthat\ssought\sto\sremember\sthe\slargest\srowid\sfor\sa\ntable\sand\sthereby\sspeed\sup\sOP_NewRowid.\s\sThat\scache\swas\sineffective.\nRemoving\sit\sresults\sin\sa\sperformance\sincrease\sof\s0.4%,\sless\smemory\susage,\nand\sa\sslightly\ssmaller\slibrary\ssize.
-D 2014-02-12T21:31:12.616
+C Minor\ssimplifications\sto\sthe\s"zeroPage()"\sroutine\sin\sbtree.c.
+D 2014-02-12T23:52:16.136
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -166,7 +166,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
 F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
-F src/btree.c 97020a77cb53fb9d8e7f172d489b8f92af1d1b82
+F src/btree.c b945df4f0114b4cc71006acc2fbb1333fb33a200
 F src/btree.h 9e0f97c01b972f779eb7655cfb4f8727fd6dc26f
 F src/btreeInt.h 0be66063468a520e4d66b80c7a1dc26d04ee6ea4
 F src/build.c 13b9d82181d95af7b00ec8a8e1304bac096432d4
@@ -1153,7 +1153,7 @@ F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 5d01426ddfb2d47c57f93f71378594e637424be0
-R 0f58210f2a6ea71dc58155d3b9fc47e4
+P 56bc5ce8958c8e6250531b4052b905d7ac993db3
+R 08bd4c102c2d08f0774c76e162878c69
 U drh
-Z 0cd8ad70eddd970bc8638e6270cc29ff
+Z ed630d5c913dd5b0515f56c704c7877e

diff --git a/manifest.uuid b/manifest.uuid
index b2a9658b531772fd7d937f231fe3ec113b990b25..2af58e32b88502502589cf8656bb0f3c78901a86 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-56bc5ce8958c8e6250531b4052b905d7ac993db3
\ No newline at end of file
+cc8f10bcb206c9def69b06f26decf025b8d9119d
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 2aac72d55cb3385e9615437e3d44667ff9cd8b7d..4fd8e27bf4e038e80bb6ba15e68d7011e32d7dc4 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -1542,13 +1542,12 @@ static void zeroPage(MemPage *pPage, int flags){
     memset(&data[hdr], 0, pBt->usableSize - hdr);
   }
   data[hdr] = (char)flags;
-  first = hdr + 8 + 4*((flags&PTF_LEAF)==0 ?1:0);
+  first = hdr + ((flags&PTF_LEAF)==0 ? 12 : 8);
   memset(&data[hdr+1], 0, 4);
   data[hdr+7] = 0;
   put2byte(&data[hdr+5], pBt->usableSize);
   pPage->nFree = (u16)(pBt->usableSize - first);
   decodeFlags(pPage, flags);
-  pPage->hdrOffset = hdr;
   pPage->cellOffset = first;
   pPage->aDataEnd = &data[pBt->usableSize];
   pPage->aCellIdx = &data[first];