aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/os_unix.c2
-rw-r--r--src/pager.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index 47f3020c7..8bd1a1272 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1465,7 +1465,7 @@ static int unixClose(sqlite3_file *id){
typedef struct afpLockingContext afpLockingContext;
struct afpLockingContext {
unsigned long long sharedLockByte;
- char *filePath;
+ const char *filePath;
};
struct ByteRangeLockPB2
diff --git a/src/pager.c b/src/pager.c
index 18fcda129..50fdda696 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
** file simultaneously, or one process from reading the database while
** another is writing.
**
-** @(#) $Id: pager.c,v 1.413 2008/03/07 19:51:14 drh Exp $
+** @(#) $Id: pager.c,v 1.414 2008/03/07 20:14:39 drh Exp $
*/
#ifndef SQLITE_OMIT_DISKIO
#include "sqliteInt.h"
@@ -1242,7 +1242,7 @@ static void pager_unlock(Pager *pPager){
if( !pPager->exclusiveMode ){
if( !MEMDB ){
int rc = osUnlock(pPager->fd, NO_LOCK);
- if( rc ) pager_error(pPager, rc);
+ if( rc ) pPager->errCode = rc;
pPager->dbSize = -1;
IOTRACE(("UNLOCK %p\n", pPager))