Fix harmless compiler warnings.

FossilOrigin-Name: 1e6a698aab9270637d3ea00fd6b0e94f4172e875

diff --git a/manifest b/manifest
index 1750fa12cb32b6dbc711e4057bca2c40d1411648..d2215a423818b0a879071d193a21c67ddff7c925 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\scleanups\sof\sthe\scompound-subquery\sflattening\slogic.\s\sNew\stest\scases\nadded\sfor\sjoins\sthe\scompound\ssubquery.
-D 2011-12-10T23:18:32.554
+C Fix\sharmless\scompiler\swarnings.
+D 2011-12-11T02:29:25.100
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -138,7 +138,7 @@ F src/expr.c 537591e95eac74af783e4eb033954fb218cf398e
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
 F src/func.c 6261ce00aad9c63cd5b4219249b05683979060e9
-F src/global.c 107ccaacb4b30895cf3a3a39decf417c804acfa1
+F src/global.c 4cfdca5cb0edd33c4d021baec4ede958cb2c793b
 F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
 F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
@@ -166,7 +166,7 @@ F src/os.c 28bbdab2170dfce84d86c45456a18eab1d0f99a9
 F src/os.h 549b1a2e5e0ed1e1499f252dac126c4973e7379c
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
-F src/os_unix.c 4fbb91726165e105c1679a2660f49a3f4c376e4f
+F src/os_unix.c 07dcae2de5f1aab27a16e6c6fc89fe1bb134026e
 F src/os_win.c 8af100f78f157eb6185fd9153d7f35b829c4da04
 F src/pager.c d981f3bfcc0e4460537d983899620700ccf8f539
 F src/pager.h 5cd760857707529b403837d813d86b68938d6183
@@ -978,7 +978,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 3d4b4f4fb7c1d9f1c742fef884383e9f50f8630e
-R cd399db3e1d12898eb15c691830496b3
+P 5061d85ff934db3c217c97acbbbed3286d9e02aa
+R 50fc7fd86c15521c2d33b9b65e5658d5
 U drh
-Z 6e0886d4861bd3870ceeed33fcdf7d2c
+Z c0a452295d74b5e6062f8bf2ec7734da

diff --git a/manifest.uuid b/manifest.uuid
index 0e5bf24ff12faace9f3187093ee229b95be48c9e..41ce00d86a6f0599c608c0f4eaef0ef4b3584c3a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5061d85ff934db3c217c97acbbbed3286d9e02aa
\ No newline at end of file
+1e6a698aab9270637d3ea00fd6b0e94f4172e875
\ No newline at end of file

diff --git a/src/global.c b/src/global.c
index b8a8a49d3df028c9b5fdb457b0c9984a9d5bba89..7de066825011fab2b45182fc81a2db3e0dbca8a5 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -147,7 +147,7 @@ SQLITE_WSD struct Sqlite3Config sqlite3Config = {
    500,                       /* nLookaside */
    {0,0,0,0,0,0,0,0},         /* m */
    {0,0,0,0,0,0,0,0,0},       /* mutex */
-   {0,0,0,0,0,0,0,0,0,0,0},   /* pcache2 */
+   {0,0,0,0,0,0,0,0,0,0,0,0,0},/* pcache2 */
    (void*)0,                  /* pHeap */
    0,                         /* nHeap */
    0, 0,                      /* mnHeap, mxHeap */

diff --git a/src/os_unix.c b/src/os_unix.c
index 51d144906a69661bed8287ab8416f9c40da46eef..0f003fc4999c5bf82e96441786f80b52b9cebe96 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -2014,8 +2014,8 @@ static int dotlockUnlock(sqlite3_file *id, int eFileLock) {
   rc = osRmdir(zLockFile);
   if( rc<0 && errno==ENOTDIR ) rc = osUnlink(zLockFile);
   if( rc<0 ){
-    int rc = 0;
     int tErrno = errno;
+    rc = 0;
     if( ENOENT != tErrno ){
       rc = SQLITE_IOERR_UNLOCK;
     }