From 3fcef1a3f973a4a675dc17a4b50c78b7be8435db Mon Sep 17 00:00:00 2001 From: drh Date: Thu, 16 Aug 2018 16:24:24 +0000 Subject: [PATCH] Fix a harmless unused-variable compiler warning that only came up in certain compile-time configurations. FossilOrigin-Name: 456842924bb33c0af8af29402f06e5f25b6791f698a0d12a080258b20b0cfb61 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/os_unix.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 7b35868d7c..4bee8d0ecf 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sEXPLAIN\sQUERY\sPLAN\sso\sthat\sit\sdescribes\sIN\soperators\simplemented\susing\na\sROWID\slookup. -D 2018-08-16T15:29:40.341 +C Fix\sa\sharmless\sunused-variable\scompiler\swarning\sthat\sonly\scame\sup\sin\scertain\ncompile-time\sconfigurations. +D 2018-08-16T16:24:24.097 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6 @@ -482,7 +482,7 @@ F src/os.c 8aeb0b0f40f8f5b0da03fe49706695adaf42d2f516ab95abc72e86c245e119de F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586 -F src/os_unix.c e681b2a3ab1085be3eb2e81254449782ca0bd0c38b73c48cb0c2480b8f2f25b9 +F src/os_unix.c d6ee0c3b3f221dd5f3cec95f0400a581c516d04ea16a2916bba17c55127d8e06 F src/os_win.c 070cdbb400097c6cda54aa005356095afdc2f3ee691d17192c54724ef146a971 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 705de01dff9c3df9739c37a6d3b58cd2b1734fdabcef829b16cdc7721a9eeaa4 @@ -1755,7 +1755,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 41399169954f9bef53c3fa89879f39823b80bd127f76cf60abbe24217878a571 -R 96a220b8cba6ef750f94d521847b3eef +P 60045fbf52162f15f2e18a4e392e80fab19bdbce242728b5e62b0894eac49dfd +R ef778d033e258ee0e19d16c1daface6f U drh -Z 818f770da7d09223bc2bbdbb6e803b14 +Z 07ccd170856bb822f4d9a35507f714c4 diff --git a/manifest.uuid b/manifest.uuid index 400de15c4f..1a30f71727 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -60045fbf52162f15f2e18a4e392e80fab19bdbce242728b5e62b0894eac49dfd \ No newline at end of file +456842924bb33c0af8af29402f06e5f25b6791f698a0d12a080258b20b0cfb61 \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index ab0a5d919a..d96c701b55 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -2111,7 +2111,7 @@ static int unixClose(sqlite3_file *id){ */ assert( pFile->pInode->nLock>0 || pFile->pInode->bProcessLock==0 ); sqlite3_mutex_enter(pInode->pLockMutex); - if( pFile->pInode->nLock ){ + if( pInode->nLock ){ /* If there are outstanding locks, do not actually close the file just ** yet because that would clear those locks. Instead, add the file ** descriptor to pInode->pUnused list. It will be automatically closed -- 2.47.2