From 76ee37f9bb393e45eaf724921853668960b34294 Mon Sep 17 00:00:00 2001 From: danielk1977 Date: Mon, 17 Sep 2007 06:06:39 +0000 Subject: [PATCH] Change the names of xGetTempName and sqlite3OsGetTempName to xGetTempname. To be consistent with xFullPathname and sqlite3OsFullPathname. (CVS 4432) FossilOrigin-Name: ad3687b16e9420d8bbaa3a645aaf803813b36061 --- manifest | 30 +++++++++++++++--------------- manifest.uuid | 2 +- src/os.c | 4 ++-- src/os.h | 2 +- src/os_unix.c | 4 ++-- src/os_win.c | 4 ++-- src/pager.c | 4 ++-- src/sqlite.h.in | 6 +++--- src/test6.c | 6 +++--- src/test_async.c | 6 +++--- src/test_onefile.c | 8 ++++---- 11 files changed, 38 insertions(+), 38 deletions(-) diff --git a/manifest b/manifest index 5f66ba0a35..a385e33a9b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Corrections\sto\sthe\swinCE\scode.\s\sUntested.\s(CVS\s4431) -D 2007-09-14T20:32:18 +C Change\sthe\snames\sof\sxGetTempName\sand\ssqlite3OsGetTempName\sto\sxGetTempname.\sTo\sbe\sconsistent\swith\sxFullPathname\sand\ssqlite3OsFullPathname.\s(CVS\s4432) +D 2007-09-17T06:06:39 F Makefile.in cbfb898945536a8f9ea8b897e1586dd1fdbcc5db F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -109,18 +109,18 @@ F src/mutex.h 079fa6fe9da18ceb89e79012c010594c6672addb F src/mutex_os2.c d47e9bd495583dd31263d8fe55160a31eb600a3c F src/mutex_unix.c ff77650261a245035b79c5c8a174f4e05d3cae8a F src/mutex_w32.c d2c56fb81aca10af1577bdae2a4083eb2505f8ee -F src/os.c 198c6c55cbdbe5b9c3105070c88fcc077d1b2447 -F src/os.h 53e65427899ed5697d79749d646e6a297b70171a +F src/os.c 521a698a82f1fbd4f3717a8da72db6d819ff0a0c +F src/os.h 143d122c04ef6cb0c914b97749a6aadd91a18a73 F src/os_common.h 98862f120ca6bf7a48ce8b16f158b77d00bc9d2f F src/os_os2.c 5b5f42180c5961b9d207748fda8f9aa0e70569c8 F src/os_os2.h c3f7d0af7e3453d1d7aa81b06c0a56f5a226530b F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3 -F src/os_unix.c 522486e24d1a743efc366cb93a727fa9314797b4 +F src/os_unix.c 2c6a5507cd2c6522db9e70ca83db1ac72816ffd4 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e -F src/os_win.c 24acb158d01b51bfadf72e42e8c2e4fe6e92b4d1 +F src/os_win.c 697dd7ad0fcfca7911542ab0bc5a1834c705a9e4 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b -F src/pager.c 7245c8a53f19ad726a6329a2af47db8d4dd650e5 +F src/pager.c f38ad4de4dcc1b4083de1f9fd494173f5e8afadc F src/pager.h d783e7f184afdc33adff37ba58d4e029bd8793b3 F src/parse.y 2d2ce439dc6184621fb0b86f4fc5aca7f391a590 F src/pragma.c 363e548dafb52327face8d99757ab56a7b1c1b26 @@ -130,7 +130,7 @@ F src/random.c 4a22746501bf36b0a088c66e38dde5daba6a35da F src/select.c 4706a6115da1bdc09a2be5991168a6cc2c0df267 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96 F src/shell.c 82089379833e361ba8a2ae65316a2173785300c0 -F src/sqlite.h.in 775be6f8a5305ef2c92506bc23181550171aaae2 +F src/sqlite.h.in 1b651cd409f3aed2e78e47f551b4a92f47dd57f4 F src/sqlite3ext.h a93f59cdee3638dc0c9c086f80df743a4e68c3cb F src/sqliteInt.h bb126b074352ef0ee20399883172161baf5eead2 F src/sqliteLimit.h 1bcbbdfa856f8b71b561abb31edb864b0eca1d12 @@ -141,11 +141,11 @@ F src/test2.c 77b34303883b9d722c65a6879bb0163a400e3789 F src/test3.c 73c1fd55d1ece61f295a6b9204fd97a139de86ae F src/test4.c c2c0f5dc907f1346f5d4b65eb5799f11eb9e4071 F src/test5.c 3a6a5717a149d7ca2e6d14f5be72cf7555d54dc4 -F src/test6.c 0513982dfef4da2a4154b538d2bf538b84ca21d3 +F src/test6.c 0f3894c2fd13d03e9903a88820d318123dbeb536 F src/test7.c ae24ba989ecc2dc600d93c6311191b5d0c596f2b F src/test8.c f113aa3723a52113d0fa7c28155ecd37e7e04077 F src/test9.c b46c8fe02ac7cca1a7316436d8d38d50c66f4b2f -F src/test_async.c c913005fbe672679c465b8027524e44d0805b52d +F src/test_async.c 70eb7a4366c3410f558745f4a19b38bcfb9992a8 F src/test_autoext.c 855157d97aa28cf84233847548bfacda21807436 F src/test_btree.c c1308ba0b88ab577fa56c9e493a09829dfcded9c F src/test_config.c 6fb459214b27952b143f45e35200d94096d54cc6 @@ -153,7 +153,7 @@ F src/test_hexio.c 94a1efec4b19311eb7c4dc40e8496a3d8eadf18a F src/test_loadext.c 22065d601a18878e5542191001f0eaa5d77c0ed8 F src/test_malloc.c c34e7696dc4a5150c82452be28b87c7e38ba15ad F src/test_md5.c 34599caee5b1c73dcf86ca31f55846fab8c19ef7 -F src/test_onefile.c f545d497cdd25991e2ece107969737306bb89532 +F src/test_onefile.c 22260e8de36d050f263088ad33bba107191d9e16 F src/test_schema.c 12c9de7661d6294eec2d57afbb52e2af1128084f F src/test_server.c a6ece6c835e7eae835054124e09e947e422b1ac5 F src/test_tclvar.c b2d1115e4d489179d3f029e765211b2ad527ba59 @@ -580,7 +580,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P 87e37eabf0ddef252bbc12f6857d33c2b136dcd3 -R 63dacfa9a69c46c46b59c30872d60756 -U drh -Z 50be175ccb458105756046a6dde04791 +P 8cc51e0a817115c4eb667f7257a3f5a4a39d0a4a +R b3d078ae916fc494191428062b49abff +U danielk1977 +Z dc8a2b824ad51bca0b771b0a8a2897ba diff --git a/manifest.uuid b/manifest.uuid index 8723a0b89e..68f710d845 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -8cc51e0a817115c4eb667f7257a3f5a4a39d0a4a \ No newline at end of file +ad3687b16e9420d8bbaa3a645aaf803813b36061 \ No newline at end of file diff --git a/src/os.c b/src/os.c index fee36708cb..bfc7e99bbc 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 86da032d17..d5edcaef8d 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 498b119655..30e2cbb26f 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 9887cc1a90..f140054f3d 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 a17db52d88..ddd9236917 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 db0ffb19db..b9d96c231d 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 b351303704..4251fc9322 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 4b7a276367..ee8d80c952 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 4699298e92..700dfcd354 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); } /*