From: drh <drh@noemail.net>
Date: Fri, 26 Feb 2010 13:07:37 +0000 (+0000)
Subject: Avoid incorrect compiler warnings by doing a couple of needless
X-Git-Tag: version-3.7.2~572
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=383d30f48392d64e1a27789f4e8b8fe8fb95bdd2;p=thirdparty%2Fsqlite.git

Avoid incorrect compiler warnings by doing a couple of needless
variable initializations.

FossilOrigin-Name: 8f29490da62df07ea922b03cab52b6edd2669edb
---

diff --git a/manifest b/manifest
index 2f8a1bdf74..4035effaba 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Increase\sthe\sversion\snumber\sto\s3.6.23\sin\spreparation\sfor\sthe\snext\srelease.
-D 2010-02-26T12:58:51
+C Avoid\sincorrect\scompiler\swarnings\sby\sdoing\sa\scouple\sof\sneedless\nvariable\sinitializations.
+D 2010-02-26T13:07:37
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -112,7 +112,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c b293534bc2df23c57668a585b17ee7faaaef0939
 F src/bitvec.c 06ad2c36a9c3819c0b9cbffec7b15f58d5d834e0
 F src/btmutex.c 96a12f50f7a17475155971a241d85ec5171573ff
-F src/btree.c fa6f583496cd84a1490d7b51231679a7b1707555
+F src/btree.c 65359edf313363a84a8d951a211873ad16ede53a
 F src/btree.h 0e193b7e90f1d78b79c79474040e3d66a553a4fa
 F src/btreeInt.h 71ed5e7f009caf17b7dc304350b3cb64b5970135
 F src/build.c 11100b66fb97638d2d874c1d34d8db90650bb1d7
@@ -153,7 +153,7 @@ F src/os.c 8bc63cf91e9802e2b807198e54e50227fa889306
 F src/os.h 534b082c3cb349ad05fa6fa0b06087e022af282c
 F src/os_common.h 240c88b163b02c21a9f21f87d49678a0aa21ff30
 F src/os_os2.c 75a8c7b9a00a2cf1a65f9fa4afbc27d46634bb2f
-F src/os_unix.c 79f2b9aec313d3e168e52b3527578c22a251bc63
+F src/os_unix.c 97c2d5dd1015c35aabef8f18399c28bb9bcb7664
 F src/os_win.c 1c7453c2df4dab26d90ff6f91272aea18bcf7053
 F src/pager.c ace73a84f53a551fb8b9334205af210a29874b2c
 F src/pager.h 1b32faf2e578ac3e7bcf9c9d11217128261c5c54
@@ -795,14 +795,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 4927c62d6214d93e582bf1266215ed3519630c15
-R af4a7e45e4a4a9405e99108a38202106
+P b5835d3e3d7f3fbf04431f9afe27dfef7b7f23c9
+R feb7fcb2626a9c46d3d79459fa07572c
 U drh
-Z 3162c30bb0f99d38c354b0e173e5f3de
+Z 93c6029ace8e0b4c79551ba55a03f862
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFLh8WRoxKgR168RlERAhAqAJ0QiRyipYMpY436kmCSp0ScHxdx9gCeLtq3
-QFma8bnc+p2xYKTQw6Gq194=
-=XP77
+iD8DBQFLh8ecoxKgR168RlERAq/AAJ4kRAjfg0SA3XpKduC7rNmZht37jwCeOopy
+3XEDjK4K1rR5rmo2LEX+6NQ=
+=Fiyc
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 4d950516a0..b7775b5722 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b5835d3e3d7f3fbf04431f9afe27dfef7b7f23c9
\ No newline at end of file
+8f29490da62df07ea922b03cab52b6edd2669edb
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index a54366241a..827eceb17f 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -5323,7 +5323,7 @@ static void insertCell(
   Pgno iChild,      /* If non-zero, replace first 4 bytes with this value */
   int *pRC          /* Read and write return code from here */
 ){
-  int idx;          /* Where to write new cell content in data[] */
+  int idx = 0;      /* Where to write new cell content in data[] */
   int j;            /* Loop counter */
   int end;          /* First byte past the last cell pointer in data[] */
   int ins;          /* Index in data[] where new cell pointer is inserted */
diff --git a/src/os_unix.c b/src/os_unix.c
index 1cce7dac10..88263df664 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1248,7 +1248,7 @@ static int unixLock(sqlite3_file *id, int locktype){
   struct unixLockInfo *pLock = pFile->pLock;
   struct flock lock;
   int s = 0;
-  int tErrno;
+  int tErrno = 0;
 
   assert( pFile );
   OSTRACE7("LOCK    %d %s was %s(%s,%d) pid=%d (unix)\n", pFile->h,