From: drh <drh@noemail.net>
Date: Sat, 1 Oct 2016 20:43:41 +0000 (+0000)
Subject: Reduce the width of a memset() to avoid double-initializing some variables.
X-Git-Tag: version-3.15.0~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=216b70ff82de0d686c01f7ea424386d402e1855f;p=thirdparty%2Fsqlite.git

Reduce the width of a memset() to avoid double-initializing some variables.

FossilOrigin-Name: 34edbfd12d6cfa6bbfa30eef9276a4865eadc869
---

diff --git a/manifest b/manifest
index 239945775f..ca02dd450c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sunnecessary\smemset()\scall.
-D 2016-10-01T19:32:54.320
+C Reduce\sthe\swidth\sof\sa\smemset()\sto\savoid\sdouble-initializing\ssome\svariables.
+D 2016-10-01T20:43:41.486
 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f
@@ -376,7 +376,7 @@ F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c bf5b71bde3e9b6110e7d6990607db881f6a471a2
 F src/pager.h 966d2769e76ae347c8a32c4165faf6e6cb64546d
 F src/parse.y 6ad22b8f4a673de775d68c5c306dddd15839c45f
-F src/pcache.c 5583c8ade4b05075a60ba953ef471d1c1a9c05df
+F src/pcache.c 5ff2a08f76a9c1b22f43eb063b7068fb085465ac
 F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 F src/pcache1.c 4bb7a6a5300c67d0b033d25adb509c120c03e812
 F src/pragma.c d932ba278654617cdd281f88a790a3185fca7c44
@@ -1525,7 +1525,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 54a449a41d8d32da2f8b73689227ced866974a18
-R 6fccc2bbb97105584088eb1a80b3a030
+P a76bff74ce47c9c98106566bde5d781992657e22
+R 9894c16f602bc73182e0b90dfc6c19cc
 U drh
-Z 51e223b0b10be817e5db370c9670ed7a
+Z 74b7a0dbeb8f3fe501e0e4424068d2fe
diff --git a/manifest.uuid b/manifest.uuid
index 6dbb71b0ee..7e97ce5af9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a76bff74ce47c9c98106566bde5d781992657e22
\ No newline at end of file
+34edbfd12d6cfa6bbfa30eef9276a4865eadc869
\ No newline at end of file
diff --git a/src/pcache.c b/src/pcache.c
index ccbcc96cd0..68f4b51dc8 100644
--- a/src/pcache.c
+++ b/src/pcache.c
@@ -461,7 +461,7 @@ static SQLITE_NOINLINE PgHdr *pcacheFetchFinishWithInit(
   assert( pPage!=0 );
   pPgHdr = (PgHdr*)pPage->pExtra;
   assert( pPgHdr->pPage==0 );
-  memset(pPgHdr, 0, sizeof(PgHdr));
+  memset(&pPgHdr->pDirty, 0, sizeof(PgHdr) - offsetof(PgHdr,pDirty));
   pPgHdr->pPage = pPage;
   pPgHdr->pData = pPage->pBuf;
   pPgHdr->pExtra = (void *)&pPgHdr[1];