Remove the xLockState method for sqlite3_io_methods. Replace it with

a defined call to xFileControl().  This simplifies the interface and
also gives us coverage testing of sqlite3_file_control(). (CVS 4355)

FossilOrigin-Name: 306586c412b87c6d12bac796641517afa3f9eb6a

1 files changed, 3 insertions, 11 deletions

diff --git a/src/test_async.c b/src/test_async.c
index 1627f912f..74147f149 100644
--- a/src/test_async.c
+++ b/src/test_async.c
@@ -612,15 +612,8 @@ static int asyncCheckReservedLock(sqlite3_file *pFile){
 /* 
 ** This is a no-op, as the asynchronous backend does not support locking.
 */
-static int asyncBreakLock(sqlite3_file *id){
-  return SQLITE_OK;
-}
-
-/* 
-** This is broken. But sqlite3OsLockState() is only used for testing anyway.
-*/
-static int asyncLockState(sqlite3_file *id){
-  return SQLITE_OK;
+static int asyncFileControl(sqlite3_file *id, int op, void *pArg){
+  return SQLITE_ERROR;
 }
 
 /* 
@@ -656,8 +649,7 @@ static int asyncOpen(
     asyncLock,                       /* xLock */
     asyncUnlock,                     /* xUnlock */
     asyncCheckReservedLock,          /* xCheckReservedLock */
-    asyncBreakLock,                  /* xBreakLock */
-    asyncLockState,                  /* xLockState */
+    asyncFileControl,                /* xFileControl */
     asyncSectorSize,                 /* xSectorSize */
     asyncDeviceCharacteristics       /* xDeviceCharacteristics */
   };