aboutsummaryrefslogtreecommitdiff
path: root/src/test_devsym.c
diff options
context:
space:
mode:
authordan <dan@noemail.net>2010-07-13 18:44:03 +0000
committerdan <dan@noemail.net>2010-07-13 18:44:03 +0000
commitda9fe0c327ae952c3e16587e069a878888b3c089 (patch)
tree51672674ac3f9f56756916f34f48d0bc4663c624 /src/test_devsym.c
parent2103245e75a2b3c9eb76af75700f800d718a66a7 (diff)
downloadsqlite-da9fe0c327ae952c3e16587e069a878888b3c089.tar.gz
sqlite-da9fe0c327ae952c3e16587e069a878888b3c089.zip
Changes so that the xShmOpen VFS method is no longer required. Its job can be done by the first call to xShmMap. Rename xShmClose to xShmUnmap.
FossilOrigin-Name: f4780bde62c6c19146d2723c101540b8db898d38
Diffstat (limited to 'src/test_devsym.c')
-rw-r--r--src/test_devsym.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/test_devsym.c b/src/test_devsym.c
index f2b91f03c..b2ebd885a 100644
--- a/src/test_devsym.c
+++ b/src/test_devsym.c
@@ -50,7 +50,6 @@ static int devsymCheckReservedLock(sqlite3_file*, int *);
static int devsymFileControl(sqlite3_file*, int op, void *pArg);
static int devsymSectorSize(sqlite3_file*);
static int devsymDeviceCharacteristics(sqlite3_file*);
-static int devsymShmOpen(sqlite3_file*);
static int devsymShmLock(sqlite3_file*,int,int,int);
static int devsymShmMap(sqlite3_file*,int,int,int, void volatile **);
static void devsymShmBarrier(sqlite3_file*);
@@ -116,9 +115,8 @@ static sqlite3_io_methods devsym_io_methods = {
devsymFileControl, /* xFileControl */
devsymSectorSize, /* xSectorSize */
devsymDeviceCharacteristics, /* xDeviceCharacteristics */
- devsymShmOpen, /* xShmOpen */
- devsymShmLock, /* xShmLock */
devsymShmMap, /* xShmMap */
+ devsymShmLock, /* xShmLock */
devsymShmBarrier, /* xShmBarrier */
devsymShmClose /* xShmClose */
};
@@ -237,10 +235,6 @@ static int devsymDeviceCharacteristics(sqlite3_file *pFile){
/*
** Shared-memory methods are all pass-thrus.
*/
-static int devsymShmOpen(sqlite3_file *pFile){
- devsym_file *p = (devsym_file *)pFile;
- return sqlite3OsShmOpen(p->pReal);
-}
static int devsymShmLock(sqlite3_file *pFile, int ofst, int n, int flags){
devsym_file *p = (devsym_file *)pFile;
return sqlite3OsShmLock(p->pReal, ofst, n, flags);