Another fix to the OsUnlock I/O error logic. (CVS 4839)

FossilOrigin-Name: 22bd537ee2af6779ecb38502513ae533f85f7c2e

diff --git a/manifest b/manifest
index 2ac532c6fcbffafc58c91f55557a9f72a73c2de2..11b3eef74a523b60c613575b057e019d5488e6b7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correctly\shandle\sI/O\serrors\sthat\soccur\sduring\sOsUnlock().\s\sBefore\sthis\nfix,\san\sI/O\serror\sduring\sOsUnlock()\scould\slead\sto\sdatabase\scorruption.\nThat\sis\snot\sa\sserious\sproblem,\sthough,\ssince\serrors\sduring\sOsUnlock()\nare\snot\spossible\son\smost\ssystems.\s(CVS\s4838)
-D 2008-03-07T19:51:14
+C Another\sfix\sto\sthe\sOsUnlock\sI/O\serror\slogic.\s(CVS\s4839)
+D 2008-03-07T20:14:39
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in d521464011d6965bbda1b699f1850c6e33141c73
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -125,11 +125,11 @@ F src/os_os2.c 10b23539e0050bdfc9f136242086a5c18c70c6f8
 F src/os_os2.h c3f7d0af7e3453d1d7aa81b06c0a56f5a226530b
 F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
-F src/os_unix.c 04ff58d84ae02d4ef732103455bfe36ce7780738
+F src/os_unix.c 4cdd17e768888b865047805ca49beeacf0929683
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
 F src/os_win.c aa3f4bbee3b8c182d25a33fbc319f486857c12c1
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
-F src/pager.c 803d361f7aabfea1eebf8951916492c77d3781a2
+F src/pager.c d8690e166a5e3a3c65a04a35a96bbebeb368a6c7
 F src/pager.h 8174615ffd14ccc2cad2b081b919a398fa95e3f9
 F src/parse.y 00f2698c8ae84f315be5e3f10b63c94f531fdd6d
 F src/pragma.c e3f39f8576234887ecd0c1de43dc51af5855930c
@@ -623,7 +623,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 40f55c09dbd31f861b9f9c7641cce92553d94e35
-R 862dd7b7066eb395b14356fb582df1d4
+P b4c1258edb4a40501d13c9da674d0366d5a8c694
+R 298c7b7df0446685a75fea13d6a4378a
 U drh
-Z aa58e6aa52b1bd4468d6e2d048a914af
+Z 7417e691146a77b72d5f4d9f4e297416

diff --git a/manifest.uuid b/manifest.uuid
index 3f780d8c89cc9509690e95a6af14966afae9d6e0..ec9a3eaa06aba981cfd2cf15c842af16ebdedcb0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b4c1258edb4a40501d13c9da674d0366d5a8c694
\ No newline at end of file
+22bd537ee2af6779ecb38502513ae533f85f7c2e
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index 47f3020c7dadc55e88f36ab234c1cab3a781c028..8bd1a12726f3f0ea8a70ec96e71c150784988c1a 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1465,7 +1465,7 @@ static int unixClose(sqlite3_file *id){
 typedef struct afpLockingContext afpLockingContext;
 struct afpLockingContext {
   unsigned long long sharedLockByte;
-  char *filePath;
+  const char *filePath;
 };
 
 struct ByteRangeLockPB2

diff --git a/src/pager.c b/src/pager.c
index 18fcda12923ea7aed7751dea7b93736dc97f4b7c..50fdda69630352d554782a311f5481fad36bfbe7 100644 (file)
--- 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.413 2008/03/07 19:51:14 drh Exp $
+** @(#) $Id: pager.c,v 1.414 2008/03/07 20:14:39 drh Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -1242,7 +1242,7 @@ static void pager_unlock(Pager *pPager){
   if( !pPager->exclusiveMode ){
     if( !MEMDB ){
       int rc = osUnlock(pPager->fd, NO_LOCK);
-      if( rc ) pager_error(pPager, rc);
+      if( rc ) pPager->errCode = rc;
       pPager->dbSize = -1;
       IOTRACE(("UNLOCK %p\n", pPager))