aboutsummaryrefslogtreecommitdiff
path: root/src/os_unix.c
diff options
context:
space:
mode:
authordan <dan@noemail.net>2010-05-10 18:10:17 +0000
committerdan <dan@noemail.net>2010-05-10 18:10:17 +0000
commit7ddccd2aad91f668f1c82a1143ed9158183e461d (patch)
tree73a6de5157418219312e79ab87c01d6dfcc84023 /src/os_unix.c
parentbb23aff3df2f6133b2d1a9febd96cdbffd5558c6 (diff)
parent1c5bb4d69c4737f6c47415d69a72f9f3a70ab8d8 (diff)
downloadsqlite-7ddccd2aad91f668f1c82a1143ed9158183e461d.tar.gz
sqlite-7ddccd2aad91f668f1c82a1143ed9158183e461d.zip
Merge [96d6eaf4d2] and [40b0a6357b].
FossilOrigin-Name: c67756c404669141fa06a1ce3f1efadefa277bc6
Diffstat (limited to 'src/os_unix.c')
-rw-r--r--src/os_unix.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index b7659dd34..8c10d1ed3 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -6127,7 +6127,7 @@ static int proxyTakeConch(unixFile *pFile){
** If pFile holds a lock on a conch file, then release that lock.
*/
static int proxyReleaseConch(unixFile *pFile){
- int rc; /* Subroutine return code */
+ int rc = SQLITE_OK; /* Subroutine return code */
proxyLockingContext *pCtx; /* The locking context for the proxy lock */
unixFile *conchFile; /* Name of the conch file */