From: drh <drh@noemail.net>
Date: Wed, 25 Nov 2015 15:15:03 +0000 (+0000)
Subject: Remove unused methods from the unix VFS.
X-Git-Tag: version-3.10.0~99
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5337dacbad4d61f48873ad228a0bf4399043d854;p=thirdparty%2Fsqlite.git

Remove unused methods from the unix VFS.

FossilOrigin-Name: 228bd15bbb7a1e6e3e0d03832e7f39ba169356a8
---

diff --git a/manifest b/manifest
index 2454a3f417..4aa83052a7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Simplification\sof\sthe\serror\scode\stranslator\sin\sos_unix.c.\s\sCode\scleanup\sonly.\nThe\slogic\sis\sunchanged.
-D 2015-11-25T14:00:07.501
+C Remove\sunused\smethods\sfrom\sthe\sunix\sVFS.
+D 2015-11-25T15:15:03.618
 F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e928e68168df69b353300ac87c10105206653a03
@@ -323,7 +323,7 @@ F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8
 F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
 F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
-F src/os_unix.c cedce5fdeec172e9392a54805979423cf5720159
+F src/os_unix.c a6ed7d9ae6e2308b61bd842d6aa296727d26b4fd
 F src/os_win.c 386fba30419e8458b13209781c2af5590eab2811
 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 F src/pager.c 18341e2b759b447cbc82fb9215d08d9c5864e92e
@@ -753,7 +753,7 @@ F test/fuzz2.test 76dc35b32b6d6f965259508508abce75a6c4d7e1
 F test/fuzz3.test 53fabcd5f0f430f8b221282f6c12c4d0903c21eb
 F test/fuzz_common.tcl a87dfbb88c2a6b08a38e9a070dabd129e617b45b
 F test/fuzz_malloc.test 328f70aaca63adf29b4c6f06505ed0cf57ca7c26
-F test/fuzzcheck.c 7c61352f20a28429b221f406f3854cf9c912f63b
+F test/fuzzcheck.c ccdcdc28579b2c9744696bca8726bdbd729eea11
 F test/fuzzdata1.db 7ee3227bad0e7ccdeb08a9e6822916777073c664
 F test/fuzzdata2.db f03a420d3b822cc82e4f894ca957618fbe9c4973
 F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba
@@ -1405,7 +1405,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 11eb8e877e2ba859ef6b44318f286597186dfaf2
-R 6dd872f66c2b35bfdd31a4b155581f40
+P 2a20f793fdf6a2e88b679a7bd4e8ccf2935df049
+R 9425887a4af2be1f5866057e942bff78
 U drh
-Z ffd91438f4f00e7137108dd3e9d6d335
+Z 8531bdf5b0fab73861e87c8c638f4398
diff --git a/manifest.uuid b/manifest.uuid
index 100264e01f..468142cf2d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2a20f793fdf6a2e88b679a7bd4e8ccf2935df049
\ No newline at end of file
+228bd15bbb7a1e6e3e0d03832e7f39ba169356a8
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index 6afbfe5cae..e31843af3b 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -6227,6 +6227,7 @@ static int unixCurrentTimeInt64(sqlite3_vfs *NotUsed, sqlite3_int64 *piNow){
   return rc;
 }
 
+#if 0 /* Not used */
 /*
 ** Find the current time (in Universal Coordinated Time).  Write the
 ** current time and date as a Julian Day number into *prNow and
@@ -6240,7 +6241,11 @@ static int unixCurrentTime(sqlite3_vfs *NotUsed, double *prNow){
   *prNow = i/86400000.0;
   return rc;
 }
+#else
+# define unixCurrentTime 0
+#endif
 
+#if 0  /* Not used */
 /*
 ** We added the xGetLastError() method with the intention of providing
 ** better low-level error messages when operating-system problems come up
@@ -6254,6 +6259,9 @@ static int unixGetLastError(sqlite3_vfs *NotUsed, int NotUsed2, char *NotUsed3){
   UNUSED_PARAMETER(NotUsed3);
   return 0;
 }
+#else
+# define unixGetLastError 0
+#endif
 
 
 /*
diff --git a/test/fuzzcheck.c b/test/fuzzcheck.c
index 32690dc466..6d9c745528 100644
--- a/test/fuzzcheck.c
+++ b/test/fuzzcheck.c
@@ -588,18 +588,13 @@ static int inmemFullPathname(
   return SQLITE_OK;
 }
 
-/* GetLastError() is never used */
-static int inmemGetLastError(sqlite3_vfs *pVfs, int n, char *z){
-  return SQLITE_OK;
-}
-
 /*
 ** Register the VFS that reads from the g.aFile[] set of files.
 */
 static void inmemVfsRegister(void){
   static sqlite3_vfs inmemVfs;
   sqlite3_vfs *pDefault = sqlite3_vfs_find(0);
-  inmemVfs.iVersion = 1;
+  inmemVfs.iVersion = 3;
   inmemVfs.szOsFile = sizeof(VHandle);
   inmemVfs.mxPathname = 200;
   inmemVfs.zName = "inmem";
@@ -609,8 +604,7 @@ static void inmemVfsRegister(void){
   inmemVfs.xFullPathname = inmemFullPathname;
   inmemVfs.xRandomness = pDefault->xRandomness;
   inmemVfs.xSleep = pDefault->xSleep;
-  inmemVfs.xCurrentTime = pDefault->xCurrentTime;
-  inmemVfs.xGetLastError = inmemGetLastError;
+  inmemVfs.xCurrentTimeInt64 = pDefault->xCurrentTimeInt64;
   sqlite3_vfs_register(&inmemVfs, 0);
 };