Bug fix: named local variable lockStyle as lockingStyle in SQLITE_ENABLE_LOCKING_STYL...

FossilOrigin-Name: aa0b96c3dfa1d8008cd944281c227604b2ee16d1

diff --git a/manifest b/manifest
index 910d34e31032494249371e8669bb557cd0242027..673035e607fbda69e2b7c32db100716d862365b2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sleaky\ssymbols.\s\sWith\sthis\schange,\sfts1\sand\sfts2\scan\sboth\sbe\nstatically\slinked.\s(CVS\s3472)
-D 2006-10-10T23:22:41
+C Bug\sfix:\snamed\slocal\svariable\slockStyle\sas\slockingStyle\sin\sSQLITE_ENABLE_LOCKING_STYLE\sblock\sin\sallocateUnixFile\s(CVS\s3473)
+D 2006-10-11T17:19:46
 F Makefile.in 4379c909d46b38b8c5db3533084601621d4f14b2
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -81,7 +81,7 @@ F src/os_os2.c 361964755f361b5ba879549c201284ce61ee9431
 F src/os_os2.h e5f17dd69333632bbc3112881ea407c37d245eb3
 F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
-F src/os_unix.c a4fa8871c85e4daf90867c3f83fd1f1c36b80d60
+F src/os_unix.c 523b674d93e0017320bb48b83fc0f9c9d07d3548
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
 F src/os_win.c 30e51641b0cb88826f25b2afcf8db3c83b7e45dd
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
@@ -410,7 +410,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P d0d1e7cdcc1dd085f1e359ce35c441699d517b02
-R bb5d7ffc9ea0e3031b5ebad6ff92ccca
-U shess
-Z 402d261f0b21be9565ead2c74242015c
+P 5e8bbb85c1493e3ab2d807d24c68294f26838e49
+R 876bb419d6818cdb37f5d2ebcd5b65dd
+U aswift
+Z 8ce919c2f327ed8920d3560f6006f3b4

diff --git a/manifest.uuid b/manifest.uuid
index e89d2af64af55e688fbf5c6a38fd0533a0f7851d..760bb8b44fb644addf1ca9f5df28e04d0bae022d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5e8bbb85c1493e3ab2d807d24c68294f26838e49
\ No newline at end of file
+aa0b96c3dfa1d8008cd944281c227604b2ee16d1
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index 8ba88771edec9bfbce9788c0af9ff7f9c908f4d7..4aa8ad0232a9146289f84c372e81e7eeefa80870 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -2445,7 +2445,7 @@ static int allocateUnixFile(
   const char *zFilename,  /* Name of the file being opened */
   int delFlag             /* Delete-on-or-before-close flag */
 ){
-  sqlite3LockingStyle lockStyle;
+  sqlite3LockingStyle lockingStyle;
   unixFile *pNew;
   unixFile f;
   int rc;
@@ -2485,7 +2485,7 @@ static int allocateUnixFile(
     return SQLITE_NOMEM;
   }else{
     *pNew = f;
-    switch(lockStyle) {
+    switch(lockingStyle) {
       case afpLockingStyle:
         /* afp locking uses the file path so it needs to be included in
         ** the afpLockingContext */