Change the names of xGetTempName and sqlite3OsGetTempName to xGetTempname. To be consistent with xFullPathname and sqlite3OsFullPathname. (CVS 4432)

FossilOrigin-Name: ad3687b16e9420d8bbaa3a645aaf803813b36061

9 files changed, 22 insertions, 22 deletions

diff --git a/src/os.c b/src/os.c
index fee36708c..bfc7e99bb 100644
--- a/src/os.c
+++ b/src/os.c
@@ -107,8 +107,8 @@ int sqlite3OsDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){
 int sqlite3OsAccess(sqlite3_vfs *pVfs, const char *zPath, int flags){
   return pVfs->xAccess(pVfs, zPath, flags);
 }
-int sqlite3OsGetTempName(sqlite3_vfs *pVfs, char *zBufOut){
-  return pVfs->xGetTempName(pVfs, zBufOut);
+int sqlite3OsGetTempname(sqlite3_vfs *pVfs, char *zBufOut){
+  return pVfs->xGetTempname(pVfs, zBufOut);
 }
 int sqlite3OsFullPathname(sqlite3_vfs *pVfs, const char *zPath, char *zPathOut){
   return pVfs->xFullPathname(pVfs, zPath, zPathOut);
diff --git a/src/os.h b/src/os.h
index 86da032d1..d5edcaef8 100644
--- a/src/os.h
+++ b/src/os.h
@@ -250,7 +250,7 @@ int sqlite3OsDeviceCharacteristics(sqlite3_file *id);
 int sqlite3OsOpen(sqlite3_vfs *, const char *, sqlite3_file*, int, int *);
 int sqlite3OsDelete(sqlite3_vfs *, const char *, int);
 int sqlite3OsAccess(sqlite3_vfs *, const char *, int);
-int sqlite3OsGetTempName(sqlite3_vfs *, char *);
+int sqlite3OsGetTempname(sqlite3_vfs *, char *);
 int sqlite3OsFullPathname(sqlite3_vfs *, const char *, char *);
 void *sqlite3OsDlOpen(sqlite3_vfs *, const char *);
 void sqlite3OsDlError(sqlite3_vfs *, int, char *);
diff --git a/src/os_unix.c b/src/os_unix.c
index 498b11965..30e2cbb26 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -2474,7 +2474,7 @@ static int unixAccess(sqlite3_vfs *pVfs, const char *zPath, int flags){
 ** by the calling process and must be big enough to hold at least
 ** pVfs->mxPathname bytes.
 */
-static int unixGetTempName(sqlite3_vfs *pVfs, char *zBuf){
+static int unixGetTempname(sqlite3_vfs *pVfs, char *zBuf){
   static const char *azDirs[] = {
      0,
      "/var/tmp",
@@ -2726,7 +2726,7 @@ sqlite3_vfs *sqlite3OsDefaultVfs(void){
     unixOpen,           /* xOpen */
     unixDelete,         /* xDelete */
     unixAccess,         /* xAccess */
-    unixGetTempName,    /* xGetTempName */
+    unixGetTempname,    /* xGetTempName */
     unixFullPathname,   /* xFullPathname */
     unixDlOpen,         /* xDlOpen */
     unixDlError,        /* xDlError */
diff --git a/src/os_win.c b/src/os_win.c
index 9887cc1a9..f140054f3 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -1267,7 +1267,7 @@ static int winAccess(
 ** Create a temporary file name in zBuf.  zBuf must be big enough to
 ** hold at pVfs->mxPathname characters.
 */
-static int winGetTempName(sqlite3_vfs *pVfs, char *zBuf){
+static int winGetTempname(sqlite3_vfs *pVfs, char *zBuf){
   static char zChars[] =
     "abcdefghijklmnopqrstuvwxyz"
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -1527,7 +1527,7 @@ sqlite3_vfs *sqlite3OsDefaultVfs(void){
     winOpen,           /* xOpen */
     winDelete,         /* xDelete */
     winAccess,         /* xAccess */
-    winGetTempName,    /* xGetTempName */
+    winGetTempname,    /* xGetTempName */
     winFullPathname,   /* xFullPathname */
     winDlOpen,         /* xDlOpen */
     winDlError,        /* xDlError */
diff --git a/src/pager.c b/src/pager.c
index a17db52d8..ddd923691 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
 ** file simultaneously, or one process from reading the database while
 ** another is writing.
 **
-** @(#) $Id: pager.c,v 1.388 2007/09/10 06:12:04 danielk1977 Exp $
+** @(#) $Id: pager.c,v 1.389 2007/09/17 06:06:39 danielk1977 Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -2054,7 +2054,7 @@ int sqlite3PagerOpen(
       rc = sqlite3OsFullPathname(pVfs, zFilename, zPathname);
     }
   }else{
-    rc = sqlite3OsGetTempName(pVfs, zPathname);
+    rc = sqlite3OsGetTempname(pVfs, zPathname);
   }
   if( rc!=SQLITE_OK ){
     sqlite3_free(zPathname);
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index db0ffb19d..b9d96c231 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -30,7 +30,7 @@
 ** the version number) and changes its name to "sqlite3.h" as
 ** part of the build process.
 **
-** @(#) $Id: sqlite.h.in,v 1.259 2007/09/04 22:31:37 drh Exp $
+** @(#) $Id: sqlite.h.in,v 1.260 2007/09/17 06:06:39 danielk1977 Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -662,7 +662,7 @@ typedef struct sqlite3_mutex sqlite3_mutex;
 ** directory.
 ** 
 ** SQLite will always allocate at least mxPathname+1 byte for
-** the output buffers for xGetTempName and xFullPathname.
+** the output buffers for xGetTempname and xFullPathname.
 ** 
 ** The xRandomness(), xSleep(), and xCurrentTime() interfaces
 ** are not strictly a part of the filesystem, but they are
@@ -687,7 +687,7 @@ struct sqlite3_vfs {
                int flags, int *pOutFlags);
   int (*xDelete)(sqlite3_vfs*, const char *zName, int syncDir);
   int (*xAccess)(sqlite3_vfs*, const char *zName, int flags);
-  int (*xGetTempName)(sqlite3_vfs*, char *zOut);
+  int (*xGetTempname)(sqlite3_vfs*, char *zOut);
   int (*xFullPathname)(sqlite3_vfs*, const char *zName, char *zOut);
   void *(*xDlOpen)(sqlite3_vfs*, const char *zFilename);
   void (*xDlError)(sqlite3_vfs*, int nByte, char *zErrMsg);
diff --git a/src/test6.c b/src/test6.c
index b35130370..4251fc932 100644
--- a/src/test6.c
+++ b/src/test6.c
@@ -568,9 +568,9 @@ static int cfAccess(sqlite3_vfs *pCfVfs, const char *zPath, int flags){
   sqlite3_vfs *pVfs = (sqlite3_vfs *)pCfVfs->pAppData;
   return pVfs->xAccess(pVfs, zPath, flags);
 }
-static int cfGetTempName(sqlite3_vfs *pCfVfs, char *zBufOut){
+static int cfGetTempname(sqlite3_vfs *pCfVfs, char *zBufOut){
   sqlite3_vfs *pVfs = (sqlite3_vfs *)pCfVfs->pAppData;
-  return pVfs->xGetTempName(pVfs, zBufOut);
+  return pVfs->xGetTempname(pVfs, zBufOut);
 }
 static int cfFullPathname(sqlite3_vfs *pCfVfs, const char *zPath, char *zPathOut){
   sqlite3_vfs *pVfs = (sqlite3_vfs *)pCfVfs->pAppData;
@@ -721,7 +721,7 @@ static int crashEnableCmd(
     cfOpen,               /* xOpen */
     cfDelete,             /* xDelete */
     cfAccess,             /* xAccess */
-    cfGetTempName,        /* xGetTempName */
+    cfGetTempname,        /* xGetTempName */
     cfFullPathname,       /* xFullPathname */
     cfDlOpen,             /* xDlOpen */
     cfDlError,            /* xDlError */
diff --git a/src/test_async.c b/src/test_async.c
index 4b7a27636..ee8d80c95 100644
--- a/src/test_async.c
+++ b/src/test_async.c
@@ -990,9 +990,9 @@ static int asyncAccess(sqlite3_vfs *pAsyncVfs, const char *zName, int flags){
   return ret;
 }
 
-static int asyncGetTempName(sqlite3_vfs *pAsyncVfs, char *zBufOut){
+static int asyncGetTempname(sqlite3_vfs *pAsyncVfs, char *zBufOut){
   sqlite3_vfs *pVfs = (sqlite3_vfs *)pAsyncVfs->pAppData;
-  return pVfs->xGetTempName(pVfs, zBufOut);
+  return pVfs->xGetTempname(pVfs, zBufOut);
 }
 
 /*
@@ -1093,7 +1093,7 @@ static sqlite3_vfs async_vfs = {
   asyncOpen,            /* xOpen */
   asyncDelete,          /* xDelete */
   asyncAccess,          /* xAccess */
-  asyncGetTempName,     /* xGetTempName */
+  asyncGetTempname,     /* xGetTempName */
   asyncFullPathname,    /* xFullPathname */
   asyncDlOpen,          /* xDlOpen */
   asyncDlError,         /* xDlError */
diff --git a/src/test_onefile.c b/src/test_onefile.c
index 4699298e9..700dfcd35 100644
--- a/src/test_onefile.c
+++ b/src/test_onefile.c
@@ -163,7 +163,7 @@ static int tmpDeviceCharacteristics(sqlite3_file*);
 static int fsOpen(sqlite3_vfs*, const char *, sqlite3_file*, int , int *);
 static int fsDelete(sqlite3_vfs*, const char *zName, int syncDir);
 static int fsAccess(sqlite3_vfs*, const char *zName, int flags);
-static int fsGetTempName(sqlite3_vfs*, char *zOut);
+static int fsGetTempname(sqlite3_vfs*, char *zOut);
 static int fsFullPathname(sqlite3_vfs*, const char *zName, char *zOut);
 static void *fsDlOpen(sqlite3_vfs*, const char *zFilename);
 static void fsDlError(sqlite3_vfs*, int nByte, char *zErrMsg);
@@ -192,7 +192,7 @@ static fs_vfs_t fs_vfs = {
     fsOpen,                                     /* xOpen */
     fsDelete,                                   /* xDelete */
     fsAccess,                                   /* xAccess */
-    fsGetTempName,                              /* xGetTempName */
+    fsGetTempname,                              /* xGetTempName */
     fsFullPathname,                             /* xFullPathname */
     fsDlOpen,                                   /* xDlOpen */
     fsDlError,                                  /* xDlError */
@@ -726,9 +726,9 @@ static int fsAccess(sqlite3_vfs *pVfs, const char *zPath, int flags){
 ** temporary file. zBufOut is guaranteed to point to a buffer of 
 ** at least (FS_MAX_PATHNAME+1) bytes.
 */
-static int fsGetTempName(sqlite3_vfs *pVfs, char *zBufOut){
+static int fsGetTempname(sqlite3_vfs *pVfs, char *zBufOut){
   sqlite3_vfs *pParent = ((fs_vfs_t *)pVfs)->pParent;
-  return pParent->xGetTempName(pParent, zBufOut);
+  return pParent->xGetTempname(pParent, zBufOut);
 }
 
 /*