From: mistachkin Date: Fri, 9 Sep 2022 17:50:29 +0000 (+0000) Subject: Fix harmless compiler warning seen with MSVC. X-Git-Tag: version-3.40.0~204 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bdb6368d725fea2eaec9cc651dfadbe9954ae138;p=thirdparty%2Fsqlite.git Fix harmless compiler warning seen with MSVC. FossilOrigin-Name: 73c4c68d3b4c16caf8281dabddd7365d24691e5ee2da89b1783eca66bfbd9280 --- diff --git a/manifest b/manifest index 4b001c1fe8..f4a1ccce49 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Enhance\san\sassert()\sto\simpose\sfor\stighter\sconstraints\son\sthe\soperation\sof\spcache. -D 2022-09-07T20:11:22.675 +C Fix\sharmless\scompiler\swarning\sseen\swith\sMSVC. +D 2022-09-09T17:50:29.375 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -573,7 +573,7 @@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586 F src/os_unix.c 102f7e5c5b59c18ea3dbc929dc3be8acb3afc0e0b6ad572e032335c9c27f44f1 -F src/os_win.c e9454cb141908e8eef2102180bad353a36480612d5b736e4c2bd5777d9b25a34 +F src/os_win.c 8d129ae3e59e0fa900e20d0ad789e96f2e08177f0b00b53cdda65c40331e0902 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 6176d9752eb580419e8fef4592dc417a6b00ddfd43ee22f818819bf8840ceee8 F src/pager.h f82e9844166e1585f5786837ddc7709966138ced17f568c16af7ccf946c2baa3 @@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 7dbddde79e3ca1b81e00288616fc27434698ce6dcb47714728fce8602ae91f45 -R 3d3ecc6a79d82686d9e0b48f58e1f898 -U drh -Z 5fb0b8be05b999eccf9a7905ecda7c89 +P 42105eb43a916a7cd839fa6c582eaffaef17f50b23c3e05142400c379feb73c7 +R fd5aff581be86e15a91eeaa3f20f7912 +U mistachkin +Z bd0ebecde4dd76aef42010e0aed5496b # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 377fe80f5e..4b00c103ba 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -42105eb43a916a7cd839fa6c582eaffaef17f50b23c3e05142400c379feb73c7 \ No newline at end of file +73c4c68d3b4c16caf8281dabddd7365d24691e5ee2da89b1783eca66bfbd9280 \ No newline at end of file diff --git a/src/os_win.c b/src/os_win.c index 2827b0b49b..d71fb39220 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -5763,7 +5763,8 @@ static int winFullPathname( char *zFull /* Output buffer */ ){ int rc; - sqlite3_mutex *pMutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_TEMPDIR); + MUTEX_LOGIC( sqlite3_mutex *pMutex; ) + MUTEX_LOGIC( pMutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_TEMPDIR); ) sqlite3_mutex_enter(pMutex); rc = winFullPathnameNoMutex(pVfs, zRelative, nFull, zFull); sqlite3_mutex_leave(pMutex);