Remove an unused field from the unix sqlite3_file object.

FossilOrigin-Name: f957f23a8a392bb1720720960bda2c7b24de9663

diff --git a/manifest b/manifest
index babc6cadde06dce99335958d824e87ea13022816..8ef1bb0a6ee83dcfcb5aa7c99c5f45df894c3467 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Simplification\sof\stests\sand\smore\sadded\sfor\sSQLITE_OMIT_UNIQUE_ENFORCEMENT\stests.
-D 2011-03-10T21:48:02.401
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Remove\san\sunused\sfield\sfrom\sthe\sunix\ssqlite3_file\sobject.
+D 2011-03-11T16:15:48.132
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -162,7 +165,7 @@ F src/os.c 22ac61d06e72a0dac900400147333b07b13d8e1d
 F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
 F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
 F src/os_os2.c 2596fd2d5d0976c6c0c628d0c3c7c4e7a724f4cf
-F src/os_unix.c 58fe8845678f6a4e30ed6988c5df7327bc7bd69b
+F src/os_unix.c c4d50608133e16185dd2e120d2713c096f390260
 F src/os_win.c 24d72407a90551969744cf9bcbb1b4c72c5fa845
 F src/pager.c 6aa906b60a59664ba58d3f746164bb010d407ce1
 F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
@@ -913,7 +916,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P ba85bf8cb88f7ae220d919f5c23f51d9dcedc843
-R 62d3b55d8406e6fbbc3a5bfec0a6bc04
-U shaneh
-Z 0d4d7d2864ef8876819acc631335ab7b
+P 75a38411a89bd2969ec5cecca13c13a390b3d478
+R 7f2984260ffacb3dffcb8dcb5c4023c8
+U drh
+Z d9c90b8af5c4c55409cdd40572c1521c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFNekq3oxKgR168RlERAnw2AJwJjXruLGtJKxCByVRypbB2NPpZ+ACfTrqn
+vTIXWbkq8AxcjkytK9CY6es=
+=V2tY
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 67b1ecec7cff11658ab076055f90a00369c6637a..36d1255651da70109014808d6d14bebd1a5ce30b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-75a38411a89bd2969ec5cecca13c13a390b3d478
\ No newline at end of file
+f957f23a8a392bb1720720960bda2c7b24de9663
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index 335fcae99c49d318d585855bdd5f30347ffceb7b..0d72802bdf9e6bc4a33dcb0a993c611e6c5d918c 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -209,7 +209,6 @@ struct unixFile {
   int lastErrno;                      /* The unix errno from last I/O error */
   void *lockingContext;               /* Locking style specific state */
   UnixUnusedFd *pUnused;              /* Pre-allocated UnixUnusedFd */
-  int fileFlags;                      /* Miscellanous flags */
   const char *zPath;                  /* Name of the file */
   unixShm *pShm;                      /* Shared memory segment information */
   int szChunk;                        /* Configured by FCNTL_CHUNK_SIZE */
@@ -243,11 +242,6 @@ struct unixFile {
 #endif
 };
 
-/*
-** The following macros define bits in unixFile.fileFlags
-*/
-#define SQLITE_WHOLE_FILE_LOCKING  0x0001   /* Use whole-file locking */
-
 /*
 ** Include code that is common to all os_*.c files
 */
@@ -4356,7 +4350,6 @@ static int fillInUnixFile(
   OSTRACE(("OPEN    %-3d %s\n", h, zFilename));
   pNew->h = h;
   pNew->dirfd = dirfd;
-  pNew->fileFlags = 0;
   pNew->zPath = zFilename;
 
 #if OS_VXWORKS