diff options
| author | drh <drh@noemail.net> | 2010-05-01 20:17:30 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2010-05-01 20:17:30 +0000 |
| commit | 2d536e187f6bac7d6756f22ca8d7e327bc64d1df (patch) | |
| tree | 36c903b85734f1bdaacdd553494a1f9cbf7bf673 /src/test_devsym.c | |
| parent | f72a8751c98d2b9c99783a6c3adcff0e2c87090a (diff) | |
| download | sqlite-2d536e187f6bac7d6756f22ca8d7e327bc64d1df.tar.gz sqlite-2d536e187f6bac7d6756f22ca8d7e327bc64d1df.zip | |
Change the SHM interface so that it does not take the name of the shared
object but rather the name of the WAL file and derives its own name from
that. Remove the xShmDelete method from the VFS and replace it with a
delete flag on xShmClose.
FossilOrigin-Name: 94dea5f9c11a68564220cec76ac3fae2ba90e907
Diffstat (limited to 'src/test_devsym.c')
| -rw-r--r-- | src/test_devsym.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/test_devsym.c b/src/test_devsym.c index dff7b9880..642073107 100644 --- a/src/test_devsym.c +++ b/src/test_devsym.c @@ -73,8 +73,7 @@ static int devsymShmSize(sqlite3_shm *, int , int *); static int devsymShmGet(sqlite3_shm *, int , int *, void **); static int devsymShmRelease(sqlite3_shm *); static int devsymShmLock(sqlite3_shm *, int , int *); -static int devsymShmClose(sqlite3_shm *); -static int devsymShmDelete(sqlite3_vfs *, const char *); +static int devsymShmClose(sqlite3_shm *, int); static sqlite3_vfs devsym_vfs = { 2, /* iVersion */ @@ -110,7 +109,6 @@ static sqlite3_vfs devsym_vfs = { 0, devsymShmLock, devsymShmClose, - devsymShmDelete, 0, 0, }; @@ -378,11 +376,8 @@ static int devsymShmRelease(sqlite3_shm *p){ static int devsymShmLock(sqlite3_shm *p, int desiredLock, int *gotLock){ return g.pVfs->xShmLock(p, desiredLock, gotLock); } -static int devsymShmClose(sqlite3_shm *p){ - return g.pVfs->xShmClose(p); -} -static int devsymShmDelete(sqlite3_vfs *pVfs, const char *zName){ - return g.pVfs->xShmDelete(g.pVfs, zName); +static int devsymShmClose(sqlite3_shm *p, int deleteFlag){ + return g.pVfs->xShmClose(p, deleteFlag); } /* @@ -400,7 +395,6 @@ void devsym_register(int iDeviceChar, int iSectorSize){ devsym_vfs.xShmRelease = (g.pVfs->xShmRelease ? devsymShmRelease : 0); devsym_vfs.xShmLock = (g.pVfs->xShmLock ? devsymShmLock : 0); devsym_vfs.xShmClose = (g.pVfs->xShmClose ? devsymShmClose : 0); - devsym_vfs.xShmDelete = (g.pVfs->xShmDelete ? devsymShmDelete : 0); sqlite3_vfs_register(&devsym_vfs, 0); } if( iDeviceChar>=0 ){ |