From: drh Date: Wed, 21 Feb 2018 00:48:02 +0000 (+0000) Subject: Remove an unnecessary memset(). X-Git-Tag: version-3.23.0~111 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f4e49a98b8d3a28384e4a14df23ae4b98e63868;p=thirdparty%2Fsqlite.git Remove an unnecessary memset(). FossilOrigin-Name: e7b7f5884a78630c6ba6a217c36247397e62f1928d4b480df929efcfc4a01893 --- diff --git a/manifest b/manifest index 2255c10023..671a63c223 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\sthe\swalIndexPage()\sroutine\sabout\s3x\sfaster\sby\sfactoring\sout\sthe\sseldom\nused\sreallocation\slogic\sinto\sa\sseparate\ssubroutine. -D 2018-02-20T22:20:57.397 +C Remove\san\sunnecessary\smemset(). +D 2018-02-21T00:48:02.760 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in a2d2fb8d17c39ab5ec52beb27850b903949080848236923f436156b72a958737 @@ -472,7 +472,7 @@ F src/os.c 22d31db3ca5a96a408fbf1ceeaaebcaf64c87024d2ff9fe1cf2ddbec3e75c104 F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586 -F src/os_unix.c 9e02186f0dcde77d3ec27d4409664eb692c4e8ea0257e30c0b7f25969fa69fec +F src/os_unix.c 928586cbde31890538854f1657463392d63b2d7794f577774573ae53ec283d7b F src/os_win.c eb03c6d52f893bcd7fdd4c6006674c13c1b5e49543fec98d605201af2997171c F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 0b6bd5442733b2e08d0673de6cdafe3e7ab0b5715e4844ac836ab346b1d9ed89 @@ -1707,7 +1707,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 cd81613850c0458b4b5b2460b9b38ce7ff6e557f7add9615058bb96f5a344ccd -R 1787f3579805a4f44923446da8d3d679 +P e2b107141cd97bd4ab240748a9ce43fc2ec950ea74610697a4a7a3d7a6441e6b +R 59bb924e6fde113e9c73dbca193c7d8f U drh -Z 192c58e6de32e2b3cf41a7ef956f2494 +Z 888a0e04ef92ada18bb625445f9ec36e diff --git a/manifest.uuid b/manifest.uuid index 83c33c8bfe..de2a013349 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e2b107141cd97bd4ab240748a9ce43fc2ec950ea74610697a4a7a3d7a6441e6b \ No newline at end of file +e7b7f5884a78630c6ba6a217c36247397e62f1928d4b480df929efcfc4a01893 \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index cb2ae33d0a..5a1d396ce2 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -4180,12 +4180,10 @@ static int unixShmSystemLock( if( pShmNode->h>=0 ){ /* Initialize the locking parameters */ - memset(&f, 0, sizeof(f)); f.l_type = lockType; f.l_whence = SEEK_SET; f.l_start = ofst; f.l_len = n; - rc = osFcntl(pShmNode->h, F_SETLK, &f); rc = (rc!=(-1)) ? SQLITE_OK : SQLITE_BUSY; }