aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2020-05-06 20:55:38 +0000
committerdrh <drh@noemail.net>2020-05-06 20:55:38 +0000
commit783e159e48979c551c204cbfe9c8f7dd4550d5e4 (patch)
tree9f080ece2c1af2138a3ab7c621752efa966999e6 /src
parent7a623e1d25f471394ac5550c6eac496ac70fbc1d (diff)
downloadsqlite-783e159e48979c551c204cbfe9c8f7dd4550d5e4.tar.gz
sqlite-783e159e48979c551c204cbfe9c8f7dd4550d5e4.zip
Fix harmless compiler warnings.
FossilOrigin-Name: 92dc59132f8547635d73c61c21ea29b380c401ddc84a6d01412808e00386b9e8
Diffstat (limited to 'src')
-rw-r--r--src/btree.c3
-rw-r--r--src/main.c2
-rw-r--r--src/sqliteInt.h2
-rw-r--r--src/wal.c2
4 files changed, 4 insertions, 5 deletions
diff --git a/src/btree.c b/src/btree.c
index 8ac3374dd..972063bfa 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -2304,8 +2304,7 @@ static int btreeInvokeBusyHandler(void *pArg){
BtShared *pBt = (BtShared*)pArg;
assert( pBt->db );
assert( sqlite3_mutex_held(pBt->db->mutex) );
- return sqlite3InvokeBusyHandler(&pBt->db->busyHandler,
- sqlite3PagerFile(pBt->pPager));
+ return sqlite3InvokeBusyHandler(&pBt->db->busyHandler);
}
/*
diff --git a/src/main.c b/src/main.c
index 0bc8edfec..83ba434be 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1664,7 +1664,7 @@ static int sqliteDefaultBusyCallback(
** If this routine returns non-zero, the lock is retried. If it
** returns 0, the operation aborts with an SQLITE_BUSY error.
*/
-int sqlite3InvokeBusyHandler(BusyHandler *p, sqlite3_file *pFile){
+int sqlite3InvokeBusyHandler(BusyHandler *p){
int rc;
if( p->xBusyHandler==0 || p->nBusy<0 ) return 0;
rc = p->xBusyHandler(p->pBusyArg, p->nBusy);
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index b01f32393..5ae69e873 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -4584,7 +4584,7 @@ void sqlite3RenameExprlistUnmap(Parse*, ExprList*);
CollSeq *sqlite3GetCollSeq(Parse*, u8, CollSeq *, const char*);
char sqlite3AffinityType(const char*, Column*);
void sqlite3Analyze(Parse*, Token*, Token*);
-int sqlite3InvokeBusyHandler(BusyHandler*, sqlite3_file*);
+int sqlite3InvokeBusyHandler(BusyHandler*);
int sqlite3FindDb(sqlite3*, Token*);
int sqlite3FindDbName(sqlite3 *, const char *);
int sqlite3AnalysisLoad(sqlite3*,int iDB);
diff --git a/src/wal.c b/src/wal.c
index d9e9ef177..d3db4b27b 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -3695,7 +3695,7 @@ int sqlite3WalCheckpoint(
/* Enable blocking locks, if possible. If blocking locks are successfully
** enabled, set xBusy2=0 so that the busy-handler is never invoked. */
sqlite3WalDb(pWal, db);
- walEnableBlocking(pWal);
+ (void)walEnableBlocking(pWal);
/* IMPLEMENTATION-OF: R-62028-47212 All calls obtain an exclusive
** "checkpoint" lock on the database file.