diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/journal.c | 5 | ||||
| -rw-r--r-- | src/memjournal.c | 5 | ||||
| -rw-r--r-- | src/os_unix.c | 16 | ||||
| -rw-r--r-- | src/vdbe.c | 4 |
4 files changed, 14 insertions, 16 deletions
diff --git a/src/journal.c b/src/journal.c index eb01930ed..2f9e22208 100644 --- a/src/journal.c +++ b/src/journal.c @@ -183,11 +183,10 @@ static struct sqlite3_io_methods JournalFileMethods = { 0, /* xFileControl */ 0, /* xSectorSize */ 0, /* xDeviceCharacteristics */ - 0, /* xShmOpen */ - 0, /* xShmLock */ 0, /* xShmMap */ + 0, /* xShmLock */ 0, /* xShmBarrier */ - 0 /* xShmClose */ + 0 /* xShmUnmap */ }; /* diff --git a/src/memjournal.c b/src/memjournal.c index fa7fc2ccb..68c2ff82b 100644 --- a/src/memjournal.c +++ b/src/memjournal.c @@ -227,11 +227,10 @@ static const struct sqlite3_io_methods MemJournalMethods = { 0, /* xFileControl */ 0, /* xSectorSize */ 0, /* xDeviceCharacteristics */ - 0, /* xShmOpen */ - 0, /* xShmLock */ 0, /* xShmMap */ + 0, /* xShmLock */ 0, /* xShmBarrier */ - 0 /* xShmClose */ + 0 /* xShmUnlock */ }; /* diff --git a/src/os_unix.c b/src/os_unix.c index e3fafca08..36fa3bb13 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -3733,7 +3733,7 @@ static const sqlite3_io_methods *(*const FINDER)(const char*,unixFile *p) \ IOMETHODS( posixIoFinder, /* Finder function name */ posixIoMethods, /* sqlite3_io_methods object name */ - 2, /* ShmOpen is enabled */ + 2, /* shared memory is enabled */ unixClose, /* xClose method */ unixLock, /* xLock method */ unixUnlock, /* xUnlock method */ @@ -3742,7 +3742,7 @@ IOMETHODS( IOMETHODS( nolockIoFinder, /* Finder function name */ nolockIoMethods, /* sqlite3_io_methods object name */ - 1, /* ShmOpen is disabled */ + 1, /* shared memory is disabled */ nolockClose, /* xClose method */ nolockLock, /* xLock method */ nolockUnlock, /* xUnlock method */ @@ -3751,7 +3751,7 @@ IOMETHODS( IOMETHODS( dotlockIoFinder, /* Finder function name */ dotlockIoMethods, /* sqlite3_io_methods object name */ - 1, /* ShmOpen is disabled */ + 1, /* shared memory is disabled */ dotlockClose, /* xClose method */ dotlockLock, /* xLock method */ dotlockUnlock, /* xUnlock method */ @@ -3762,7 +3762,7 @@ IOMETHODS( IOMETHODS( flockIoFinder, /* Finder function name */ flockIoMethods, /* sqlite3_io_methods object name */ - 1, /* ShmOpen is disabled */ + 1, /* shared memory is disabled */ flockClose, /* xClose method */ flockLock, /* xLock method */ flockUnlock, /* xUnlock method */ @@ -3774,7 +3774,7 @@ IOMETHODS( IOMETHODS( semIoFinder, /* Finder function name */ semIoMethods, /* sqlite3_io_methods object name */ - 1, /* ShmOpen is disabled */ + 1, /* shared memory is disabled */ semClose, /* xClose method */ semLock, /* xLock method */ semUnlock, /* xUnlock method */ @@ -3786,7 +3786,7 @@ IOMETHODS( IOMETHODS( afpIoFinder, /* Finder function name */ afpIoMethods, /* sqlite3_io_methods object name */ - 1, /* ShmOpen is disabled */ + 1, /* shared memory is disabled */ afpClose, /* xClose method */ afpLock, /* xLock method */ afpUnlock, /* xUnlock method */ @@ -3811,7 +3811,7 @@ static int proxyCheckReservedLock(sqlite3_file*, int*); IOMETHODS( proxyIoFinder, /* Finder function name */ proxyIoMethods, /* sqlite3_io_methods object name */ - 1, /* ShmOpen is disabled */ + 1, /* shared memory is disabled */ proxyClose, /* xClose method */ proxyLock, /* xLock method */ proxyUnlock, /* xUnlock method */ @@ -3824,7 +3824,7 @@ IOMETHODS( IOMETHODS( nfsIoFinder, /* Finder function name */ nfsIoMethods, /* sqlite3_io_methods object name */ - 1, /* ShmOpen is disabled */ + 1, /* shared memory is disabled */ unixClose, /* xClose method */ unixLock, /* xLock method */ nfsUnlock, /* xUnlock method */ diff --git a/src/vdbe.c b/src/vdbe.c index 8181361ee..6813837d2 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -5213,11 +5213,11 @@ case OP_JournalMode: { /* out2-prerelease */ zFilename = sqlite3PagerFilename(pPager); /* Do not allow a transition to journal_mode=WAL for a database - ** in temporary storage or if the VFS does not support xShmOpen. + ** in temporary storage or if the VFS does not support shared memory */ if( eNew==PAGER_JOURNALMODE_WAL && (zFilename[0]==0 /* Temp file */ - || !sqlite3PagerWalSupported(pPager)) /* No xShmOpen support */ + || !sqlite3PagerWalSupported(pPager)) /* No shared-memory support */ ){ eNew = eOld; } |