Change the name of the xShmClose VFS method to xShmUnmap, everywhere.

FossilOrigin-Name: c2d27cf51d33e6f38bab37008d39074051f75274

8 files changed, 18 insertions, 15 deletions

diff --git a/src/os.c b/src/os.c
index 63b2b04d2..136e9eb55 100644
--- a/src/os.c
+++ b/src/os.c
@@ -106,7 +106,7 @@ int sqlite3OsShmLock(sqlite3_file *id, int offset, int n, int flags){
 void sqlite3OsShmBarrier(sqlite3_file *id){
   id->pMethods->xShmBarrier(id);
 }
-int sqlite3OsShmClose(sqlite3_file *id, int deleteFlag){
+int sqlite3OsShmUnmap(sqlite3_file *id, int deleteFlag){
   return id->pMethods->xShmUnmap(id, deleteFlag);
 }
 int sqlite3OsShmMap(
diff --git a/src/os.h b/src/os.h
index d5ffa1774..7f17c203e 100644
--- a/src/os.h
+++ b/src/os.h
@@ -250,7 +250,7 @@ int sqlite3OsDeviceCharacteristics(sqlite3_file *id);
 int sqlite3OsShmMap(sqlite3_file *,int,int,int,void volatile **);
 int sqlite3OsShmLock(sqlite3_file *id, int, int, int);
 void sqlite3OsShmBarrier(sqlite3_file *id);
-int sqlite3OsShmClose(sqlite3_file *id, int);
+int sqlite3OsShmUnmap(sqlite3_file *id, int);
 
 /* 
 ** Functions for accessing sqlite3_vfs methods 
diff --git a/src/os_unix.c b/src/os_unix.c
index 36fa3bb13..ba614c563 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3607,6 +3607,9 @@ static void unixShmBarrier(
 /*
 ** Close a connection to shared-memory.  Delete the underlying 
 ** storage if deleteFlag is true.
+**
+** If there is no shared memory associated with the connection then this
+** routine is a harmless no-op.
 */
 static int unixShmUnmap(
   sqlite3_file *fd,               /* The underlying database file */
diff --git a/src/os_win.c b/src/os_win.c
index 9349c4588..b9de7924e 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -1481,7 +1481,7 @@ shm_open_err:
 ** Close a connection to shared-memory.  Delete the underlying 
 ** storage if deleteFlag is true.
 */
-static int winShmClose(
+static int winShmUnmap(
   sqlite3_file *fd,          /* Database holding shared memory */
   int deleteFlag             /* Delete after closing if true */
 ){
@@ -1763,7 +1763,7 @@ shmpage_out:
 # define winShmMap     0
 # define winShmLock    0
 # define winShmBarrier 0
-# define winShmClose   0
+# define winShmUnmap   0
 #endif /* #ifndef SQLITE_OMIT_WAL */
 
 /*
@@ -1793,7 +1793,7 @@ static const sqlite3_io_methods winIoMethod = {
   winShmMap,                      /* xShmMap */
   winShmLock,                     /* xShmLock */
   winShmBarrier,                  /* xShmBarrier */
-  winShmClose                     /* xShmClose */
+  winShmUnmap                     /* xShmUnmap */
 };
 
 /****************************************************************************
diff --git a/src/test6.c b/src/test6.c
index cb87cf23c..c9c8a4d20 100644
--- a/src/test6.c
+++ b/src/test6.c
@@ -529,8 +529,8 @@ static int cfShmLock(sqlite3_file *pFile, int ofst, int n, int flags){
 static void cfShmBarrier(sqlite3_file *pFile){
   sqlite3OsShmBarrier(((CrashFile*)pFile)->pRealFile);
 }
-static int cfShmClose(sqlite3_file *pFile, int delFlag){
-  return sqlite3OsShmClose(((CrashFile*)pFile)->pRealFile, delFlag);
+static int cfShmUnmap(sqlite3_file *pFile, int delFlag){
+  return sqlite3OsShmUnmap(((CrashFile*)pFile)->pRealFile, delFlag);
 }
 static int cfShmMap(
   sqlite3_file *pFile,            /* Handle open on database file */
@@ -559,7 +559,7 @@ static const sqlite3_io_methods CrashFileVtab = {
   cfShmMap,                     /* xShmMap */
   cfShmLock,                    /* xShmLock */
   cfShmBarrier,                 /* xShmBarrier */
-  cfShmClose                    /* xShmClose */
+  cfShmUnmap                    /* xShmUnmap */
 };
 
 /*
diff --git a/src/test_devsym.c b/src/test_devsym.c
index b2ebd885a..21f0f684d 100644
--- a/src/test_devsym.c
+++ b/src/test_devsym.c
@@ -53,7 +53,7 @@ static int devsymDeviceCharacteristics(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*);
-static int devsymShmClose(sqlite3_file*,int);
+static int devsymShmUnmap(sqlite3_file*,int);
 
 /*
 ** Method declarations for devsym_vfs.
@@ -118,7 +118,7 @@ static sqlite3_io_methods devsym_io_methods = {
   devsymShmMap,                     /* xShmMap */
   devsymShmLock,                    /* xShmLock */
   devsymShmBarrier,                 /* xShmBarrier */
-  devsymShmClose                    /* xShmClose */
+  devsymShmUnmap                    /* xShmUnmap */
 };
 
 struct DevsymGlobal {
@@ -253,9 +253,9 @@ static void devsymShmBarrier(sqlite3_file *pFile){
   devsym_file *p = (devsym_file *)pFile;
   sqlite3OsShmBarrier(p->pReal);
 }
-static int devsymShmClose(sqlite3_file *pFile, int delFlag){
+static int devsymShmUnmap(sqlite3_file *pFile, int delFlag){
   devsym_file *p = (devsym_file *)pFile;
-  return sqlite3OsShmClose(p->pReal, delFlag);
+  return sqlite3OsShmUnmap(p->pReal, delFlag);
 }
 
 
diff --git a/src/test_onefile.c b/src/test_onefile.c
index 64d5a66a3..cd7db008c 100644
--- a/src/test_onefile.c
+++ b/src/test_onefile.c
@@ -222,7 +222,7 @@ static sqlite3_io_methods fs_io_methods = {
   0,                            /* xShmMap */
   0,                            /* xShmLock */
   0,                            /* xShmBarrier */
-  0                             /* xShmClose */
+  0                             /* xShmUnmap */
 };
 
 
@@ -243,7 +243,7 @@ static sqlite3_io_methods tmp_io_methods = {
   0,                            /* xShmMap */
   0,                            /* xShmLock */
   0,                            /* xShmBarrier */
-  0                             /* xShmClose */
+  0                             /* xShmUnmap */
 };
 
 /* Useful macros used in several places */
diff --git a/src/wal.c b/src/wal.c
index a6bc7c121..9a9b2dc0e 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -1167,7 +1167,7 @@ recovery_error:
 ** Close an open wal-index.
 */
 static void walIndexClose(Wal *pWal, int isDelete){
-  sqlite3OsShmClose(pWal->pDbFd, isDelete);
+  sqlite3OsShmUnmap(pWal->pDbFd, isDelete);
 }
 
 /*