From: mistachkin <mistachkin@noemail.net>
Date: Fri, 7 Jul 2017 16:07:53 +0000 (+0000)
Subject: Remove a block from the Win32 VFS for lsm1 that is now superfluous.
X-Git-Tag: version-3.20.0~118^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5bd9e61f0552e4be71124364c48db0f0ceff1d47;p=thirdparty%2Fsqlite.git

Remove a block from the Win32 VFS for lsm1 that is now superfluous.

FossilOrigin-Name: db4a41408eff450ee429b936847313c2c92ba1f5b1fcbadaacaff3c08bfdd589
---

diff --git a/ext/lsm1/lsm_win32.c b/ext/lsm1/lsm_win32.c
index c6e90760e0..4408117376 100644
--- a/ext/lsm1/lsm_win32.c
+++ b/ext/lsm1/lsm_win32.c
@@ -687,10 +687,6 @@ static int lsmWin32OsShmMap(lsm_file *pFile, int iChunk, int sz, void **ppShm){
     }
     memcpy(ahNew, pWin32File->ahShm, pWin32File->nShm);
     memcpy(apNew, pWin32File->apShm, pWin32File->nShm);
-    for(i=pWin32File->nShm; i<nNew; i++){
-      ahNew[i] = NULL;
-      apNew[i] = NULL;
-    }
     lsmFree(pWin32File->pEnv, pWin32File->ahShm);
     pWin32File->ahShm = ahNew;
     lsmFree(pWin32File->pEnv, pWin32File->apShm);
diff --git a/manifest b/manifest
index 2671c0931e..23925d6113 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Memory\sreallocation\sfix\sfor\sthe\sWin32\sVFS\sfor\slsm1.
-D 2017-07-07T16:06:30.430
+C Remove\sa\sblock\sfrom\sthe\sWin32\sVFS\sfor\slsm1\sthat\sis\snow\ssuperfluous.
+D 2017-07-07T16:07:53.846
 F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 4ebb1d257cac7fb1bcb4ba59278416d410ff1c4bf59447a9c37a415f3516056a
@@ -250,7 +250,7 @@ F ext/lsm1/lsm_tree.c 53b657439e0fcb1117b0559ad3567ac417f81f2ed0fff9bab79948a00e
 F ext/lsm1/lsm_unix.c 57361bcf5b1a1a028f5d66571ee490e9064d2cfb145a2cc9e5ddade467bb551b
 F ext/lsm1/lsm_varint.c b19ae9bd26b5a1e8402fb8a564b25d9542338a41
 F ext/lsm1/lsm_vtab.c 812b74a9a7539e8cab49761591ffddc1b3580735fac5d638826c8d2be95ff38b
-F ext/lsm1/lsm_win32.c e2114824b1db4aea6212e05c16ab70370de46896d1d825dc4f8702411bd269f7
+F ext/lsm1/lsm_win32.c 9745cebaf03c6e04f0017d0dda8dc1db447a372b9ae4e32e1119ded10e1b54bc
 F ext/misc/README.md 8e008c8d2b02e09096b31dfba033253ac27c6c06a18aa5826e299fa7601d90b2
 F ext/misc/amatch.c 6db4607cb17c54b853a2d7c7c36046d004853f65b9b733e6f019d543d5dfae87
 F ext/misc/anycollseq.c 5ffdfde9829eeac52219136ad6aa7cd9a4edb3b15f4f2532de52f4a22525eddb
@@ -1628,7 +1628,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 c46f0f076c674891e20240bad56693d891aedc43004bcf980a5d199515f23413
-R 4d89fae253073c0782e85c8a3d95f158
+P 5a3140e4dedace6de4366a3c52e41b818b6d19f356fdab738c6605afc1b674fa
+R a03373dd14b96ee1d17b02c010e8a282
 U mistachkin
-Z 1b373bb5c83dcb5af7e9a15d3d0aec3e
+Z a482709fb19951e1c4f3858db622ab32
diff --git a/manifest.uuid b/manifest.uuid
index 4ffaaa20cc..5b28fe3e66 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5a3140e4dedace6de4366a3c52e41b818b6d19f356fdab738c6605afc1b674fa
\ No newline at end of file
+db4a41408eff450ee429b936847313c2c92ba1f5b1fcbadaacaff3c08bfdd589
\ No newline at end of file