From: drh <drh@noemail.net>
Date: Wed, 9 Sep 2009 16:10:50 +0000 (+0000)
Subject: Suppress some harmless compiler warnings.
X-Git-Tag: fts3-refactor~198
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f022189dd7baca7c89c62f9c154067da2c389c0;p=thirdparty%2Fsqlite.git

Suppress some harmless compiler warnings.

FossilOrigin-Name: f0c72a53c5d57d7487b48a06a40816153f47aaac
---

diff --git a/manifest b/manifest
index 1b71c264e4..282c146527 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Bug\sfix\sin\sthe\sSQLITE_OPEN_PRIVATECACHE\soption\sadded\sa\sfew\sminutes\sago.
-D 2009-09-09T15:29:42
+C Suppress\ssome\sharmless\scompiler\swarnings.
+D 2009-09-09T16:10:51
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 73ddeec9dd10b85876c5c2ce1fdce627e1dcc7f8
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -116,7 +116,7 @@ F src/build.c 5269733241f459705189aa39f4eacf18b10d7661
 F src/callback.c f49c305dc94b78da948953c392963929c0e70f9b
 F src/complete.c 5ad5c6cd4548211867c204c41a126d73a9fbcea0
 F src/date.c ab5f7137656652a48434d64f96bdcdc823bb23b3
-F src/delete.c 70abd255f094f37411d7c76c65874cf86d435529
+F src/delete.c 7ef5a39beae236620825075ac7229316586aae80
 F src/expr.c 638b599adad562d41c3bf90f542f9419664aa7b8
 F src/fault.c dc88c821842157460750d2d61a8a8b4197d047ff
 F src/func.c e536218d193b8d326aab91120bc4c6f28aa2b606
@@ -148,7 +148,7 @@ F src/os.c 8d62d8d98ad7909cb0dd294c1e5f3835c887ccb6
 F src/os.h 00a1334a4eecee7f7bef79ac606b88d325119f21
 F src/os_common.h 8c61457df58f1a4bd5f5adc3e90e01b37bf7afbc
 F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
-F src/os_unix.c 52b10971479bb77c0c1ed334f0a73cd87b972ee0
+F src/os_unix.c 0b94e58153de8e4c1de92d66f2d1bb006a36b749
 F src/os_win.c 58bb163f327e79726dd119344d908e4d98483c3f
 F src/pager.c ebd0a8f2421e8f0ad5b78201440004bf3e1c96d8
 F src/pager.h 11852d044c86cf5a9d6e34171fb0c4fcf1f6265f
@@ -217,7 +217,7 @@ F src/vdbeblob.c 4d6b702ca714a2d52552eee72d3e3191f8444eab
 F src/vdbemem.c 0ff2b209fccade3ff6709286057b82ed7f6c1e70
 F src/vtab.c 3e54fe39374e5feb8b174de32a90e7a21966025d
 F src/walker.c 1edca756275f158b80f20eb6f104c8d3fcc96a04
-F src/where.c 15b38ff11d83f749ac61ef2ab5ad7ddbee273d69
+F src/where.c 68db8ab9b465f595043d05ff697b953268485df4
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
 F test/all.test 14165b3e32715b700b5f0cbf8f6e3833dda0be45
@@ -753,14 +753,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 9a4c59a2ddd0df2d9425097004b450a6685f2147
-R 5131e4a9b3f41623ba532550763c03a1
+P f3a0f23bc77f8c73924f1d371afae9a0f65bae67
+R b16c1b731cdc4658184133bff960f4e9
 U drh
-Z ae5e0f0c16a5343df21b237b0766f750
+Z 9364e9d4ce92a22f7d14a7b57436a994
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFKp8npoxKgR168RlERAv1bAJ0aF/KTP118glE3qoI9dc8VOR61egCfRrok
-8sC7egkdVi/Qa43YRpCpvC8=
-=gxHU
+iD8DBQFKp9OPoxKgR168RlERAi6/AJ9Ts3lTzWavfx23Xorcbo4eQkzl9wCeJxVU
+IgsZnwseNwvtNHambzFTAso=
+=57r7
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index c5c74d272b..f25000b5a8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f3a0f23bc77f8c73924f1d371afae9a0f65bae67
\ No newline at end of file
+f0c72a53c5d57d7487b48a06a40816153f47aaac
\ No newline at end of file
diff --git a/src/delete.c b/src/delete.c
index 6f4b54e917..7e5b7bfc4f 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -467,7 +467,7 @@ void sqlite3GenerateRowDelete(
   int onconf         /* Default ON CONFLICT policy for triggers */
 ){
   Vdbe *v = pParse->pVdbe;        /* Vdbe */
-  int iOld;                       /* First register in OLD.* array */
+  int iOld = 0;                   /* First register in OLD.* array */
   int iLabel;                     /* Label resolved to end of generated code */
 
   /* Vdbe is guaranteed to have been allocated by this stage. */
diff --git a/src/os_unix.c b/src/os_unix.c
index 83e9ce2315..9b6afe5371 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1278,7 +1278,7 @@ static int unixLock(sqlite3_file *id, int locktype){
   unixFile *pFile = (unixFile*)id;
   struct unixLockInfo *pLock = pFile->pLock;
   struct flock lock;
-  int s;
+  int s = 0;
   int tErrno;
 
   assert( pFile );
diff --git a/src/where.c b/src/where.c
index 9859ab5587..702bdaf035 100644
--- a/src/where.c
+++ b/src/where.c
@@ -2082,6 +2082,10 @@ static int whereRangeScanEst(
     return rc;
   }
 range_est_fallback:
+#else
+  UNUSED_PARAMETER(pParse);
+  UNUSED_PARAMETER(p);
+  UNUSED_PARAMETER(nEq);
 #endif
   assert( pLower || pUpper );
   if( pLower && pUpper ){