From: dan <dan@noemail.net>
Date: Thu, 25 Feb 2010 07:44:08 +0000 (+0000)
Subject: Add some technically unnecessary variable initializations to silence compiler warnings.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1a590780b830ba05d71501097948feed9dd8efb;p=thirdparty%2Fsqlite.git

Add some technically unnecessary variable initializations to silence compiler warnings.

FossilOrigin-Name: a25505978638bcb8fe11ab0bb4c17c3aec698d74
---

diff --git a/manifest b/manifest
index 42063cbbb8..292bcc0e93 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\ssegfault\sthat\scan\soccur\sif\sa\smalloc\sfails\sin\sATTACH\sin\sshared-cache\smode.
-D 2010-02-23T10:50:27
+C Add\ssome\stechnically\sunnecessary\svariable\sinitializations\sto\ssilence\scompiler\swarnings.
+D 2010-02-25T07:44:09
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 2713ea64947be3b35f35d9a3158bb8299c90b019
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -90,28 +90,28 @@ F sqlite.pc.in c322c6244c6395955dca34d87955aabde7df7623
 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
 F sqlite3.def a1be7b9a4b8b51ac41c6ff6e8e44a14ef66b338b
 F sqlite3.pc.in 32b8a014799c2028c8e0c9cc5659718262fc493f
-F src/alter.c 2c541aaa88d720301253f181799d4af7bb9ddf1c
+F src/alter.c f1c7a868b72dda8ce72c1292479c6e8979924a74
 F src/analyze.c 747ce8cb6b318bb0d0576cfb5277aed98cbbeb5c
 F src/attach.c c4adb24b40039bf6fcb091db7db51524e44c5505
 F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
 F src/bitvec.c 95c86bd18d8fedf0533f5af196192546e10a7e7d
 F src/btmutex.c 709cad2cdca0afd013f0f612363810e53f59ec53
-F src/btree.c da7491ef06c0209da962e1520bfc5c90b5c5cc96
+F src/btree.c 171eceee4a8d8eac8fbd35858ed116489f695638
 F src/btree.h 03256ed7ee42b5ecacbe887070b0f8249e7d069d
 F src/btreeInt.h ab18c7b4980314e9e4b402e5dcde09f3c2545576
 F src/build.c d8fe03f76229e333c9e1989eb22b4120f1f46376
 F src/callback.c c9f75a4c403f166af3761df47d78a806587d63af
 F src/complete.c cb14e06dbe79dee031031f0d9e686ff306afe07c
 F src/date.c 52a54811218a76da6235420f532ece841159a96d
-F src/delete.c 0d115c173863b3c688c3083ef7857c7f2e9f7a18
-F src/expr.c 4f5221197384d923525fdfd117298eab073e9539
+F src/delete.c 28595a17b73d40e35fd285cd3741e9f5bade6b1d
+F src/expr.c d2046feae56970f15dd6fc89fb9193d973fbb644
 F src/fault.c 3638519d1e0b82bccfafcb9f5ff491918b28f8e1
-F src/func.c 54efe220cc1ef3859a4b738011621b63a0d697c5
+F src/func.c 596688b58c289e922e40139d030f847d1f82bf34
 F src/global.c b9c96ee2317a6e1391763c7db1098a6473a91863
 F src/hash.c eb64e48f3781100e5934f759fbe72a63a8fe78cb
 F src/hash.h 031cd9f915aff27e12262cb9eb570ac1b8326b53
 F src/hwtime.h 4a1d45f4cae1f402ea19686acf24acf4f0cb53cb
-F src/insert.c 89cd9af52a5ea6fb7d0cfc9c3b935d6406c360c4
+F src/insert.c 223a368a9e0d1e446a8df091a5b65189df4c5704
 F src/journal.c cffd2cd214e58c0e99c3ff632b3bee6c7cbb260e
 F src/legacy.c aac57bd984e666059011ea01ec4383892a253be3
 F src/loadext.c eb1fe4f44d7c8ff53fc0c6a4388ab79fbd34cd64
@@ -135,14 +135,14 @@ F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
 F src/os_os2.c 676ed273b17bd260f905df81375c9f9950d85517
 F src/os_unix.c fe0dbc35bcd3de49e46b132abfc0f45d6dd6a864
 F src/os_win.c aefe9ee26430678a19a058a874e4e2bd91398142
-F src/pager.c b6a366f2343e7f127d7e70dbe76cd664336143cd
+F src/pager.c 0e7b4ddc5ffddd8cc369058606b4dcb714e08456
 F src/pager.h 588c1ac195228b2da45c4e5f7ab6c2fd253d1751
 F src/parse.y d962e544d9953289db23c1d4cc2dab514c7136fa
 F src/pragma.c 6e207b4f69901089758c02c02e0bf86ed12a4d8f
 F src/prepare.c d9f420808f7d2802258f0bf64103271311e2d87f
-F src/printf.c 2e984b2507291a7e16d89dc9bb60582904f6247d
+F src/printf.c fd40f2fe2951b34290ad1c2d8b65a375b7ea2194
 F src/random.c 5c754319d38abdd6acd74601ee0105504adc508a
-F src/select.c c1899b14f5eb3d3b71aeb02d541d6c5052ad3b70
+F src/select.c c5d15b97a5a26b34f83b0109e4bca398b703164b
 F src/shell.c 4b835fe734304ac22a3385868cd3790c1e4f7aa1
 F src/sqlite.h.in 157cd9932c2747a6ef3cb091e006185f4f9105d3
 F src/sqlite3ext.h 1e3887c9bd3ae66cb599e922824b04cd0d0f2c3e
@@ -179,11 +179,11 @@ F src/test_tclvar.c 73530070df8378571c8ce6bbbbb993236ae3ad0b
 F src/test_thread.c e297dd41db0b249646e69f97d36ec13e56e8b730
 F src/tokenize.c bfdc945527a4645bf54c8bf34d1f18c019b37117
 F src/trigger.c b61aaf7bff8e3763b234dbf46a1a64fb88a34e64
-F src/update.c 79b77a3cc8ed5f8903a7f37055fcedd69388dcae
+F src/update.c 1d7d70ac77b4e2fd9004f1279ed5dc645599ece9
 F src/utf.c a7004436a6ef2aee012ace93de274dd0f3c7624e
-F src/util.c afe659ccc05d1f8af9e8631dabfec3ee3a7144af
+F src/util.c 0828dd2ff38e66a5f641d58715f77518dfd01a95
 F src/vacuum.c ef342828002debc97514617af3424aea8ef8522c
-F src/vdbe.c 96e0527ad121b1308ed4ab5d02ff5b8a5f434e7f
+F src/vdbe.c 412c486b22f29cfdf922c6588c209f35127c3962
 F src/vdbe.h 647fcf33a551ba10a974162c56846cb9aef2276b
 F src/vdbeInt.h 6f04c2bf65a0d5c2bb8318b226278a35d1f7a8f5
 F src/vdbeapi.c 803f365b77a22c1b2680a0dee9202bc75c02bf4a
@@ -568,7 +568,7 @@ F test/utf16align.test 7360e84472095518c56746f76b1f9d4dce99fb4d
 F test/vacuum.test 0bc75ee74ab9c69322d6563aa2287375697e630b
 F test/vacuum2.test d3b9691541fe6ed5c711f547a1c7d70e9760ac6f
 F test/vacuum3.test 306b65554980d8d4a3b6eeb7b3ccd11c65ebb540
-F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102
+F test/varint.test bbce22cda8fc4d135bcc2b589574be8410614e62
 F test/veryquick.test e265401afefa994cdf2fe4b6f286b1e87c2f9b9d
 F test/view.test 5799906511d6c77cfe3516d3d1189224350ef732
 F test/vtab1.test e321e3c80434fe8de97fa4ad815882d2c7838d21
@@ -617,7 +617,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 62b4891b155ae566006236fee368794eabcd71a3
-R d96209734cd2738ccdad625a0426d4ae
+P d6343d035df36217e44549cfbcd9c1138658266c
+R 056c8f25079b6a0c98d4704094fdc89c
 U dan
-Z 9b5cc3787278b4c31dbe3b17b7863d17
+Z c7247ac8bdf6ccfe1c002c48b028ad66
diff --git a/manifest.uuid b/manifest.uuid
index f10660375d..388a2ab261 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d6343d035df36217e44549cfbcd9c1138658266c
\ No newline at end of file
+a25505978638bcb8fe11ab0bb4c17c3aec698d74
\ No newline at end of file
diff --git a/src/alter.c b/src/alter.c
index ba929beddc..8fa940e429 100644
--- a/src/alter.c
+++ b/src/alter.c
@@ -46,7 +46,7 @@ static void renameTableFunc(
   unsigned char const *zTableName = sqlite3_value_text(argv[1]);
 
   int token;
-  Token tname;
+  Token tname = {0,0,0};               /* Initialized to placate warning */
   unsigned char const *zCsr = zSql;
   int len = 0;
   char *zRet;
@@ -101,7 +101,7 @@ static void renameTriggerFunc(
   unsigned char const *zTableName = sqlite3_value_text(argv[1]);
 
   int token;
-  Token tname;
+  Token tname = {0,0,0};               /* Initialized to placate warning */
   int dist = 3;
   unsigned char const *zCsr = zSql;
   int len = 0;
diff --git a/src/btree.c b/src/btree.c
index 3daa8f807f..86209adb3c 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -3021,7 +3021,7 @@ static int getOverflowPage(
   Pgno *pPgnoNext              /* OUT: Next overflow page number */
 ){
   Pgno next = 0;
-  int rc;
+  int rc = SQLITE_OK;          /* Initialized to placate warning */
 
   assert( sqlite3_mutex_held(pBt->mutex) );
   /* One of these must not be NULL. Otherwise, why call this function? */
diff --git a/src/delete.c b/src/delete.c
index 26824241e2..c51956465b 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -143,10 +143,10 @@ void sqlite3DeleteFrom(
   int isView;                  /* True if attempting to delete from a view */
   int triggers_exist = 0;      /* True if any triggers exist */
 #endif
-  int iBeginAfterTrigger;      /* Address of after trigger program */
-  int iEndAfterTrigger;        /* Exit of after trigger program */
-  int iBeginBeforeTrigger;     /* Address of before trigger program */
-  int iEndBeforeTrigger;       /* Exit of before trigger program */
+  int iBeginAfterTrigger = 0;  /* Address of after trigger program */
+  int iEndAfterTrigger = 0;    /* Exit of after trigger program */
+  int iBeginBeforeTrigger = 0; /* Address of before trigger program */
+  int iEndBeforeTrigger = 0;   /* Exit of before trigger program */
   u32 old_col_mask = 0;        /* Mask of OLD.* columns in use */
 
   sContext.pParse = 0;
diff --git a/src/expr.c b/src/expr.c
index e8d8a1e993..eb006d96d3 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -2737,7 +2737,7 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
       Expr opCompare;                   /* The X==Ei expression */
       Expr cacheX;                      /* Cached expression X */
       Expr *pX;                         /* The X expression */
-      Expr *pTest;                      /* X==Ei (form A) or just Ei (form B) */
+      Expr *pTest = 0;                  /* X==Ei (form A) or just Ei (form B) */
 
       assert(pExpr->pList);
       assert((pExpr->pList->nExpr % 2) == 0);
diff --git a/src/func.c b/src/func.c
index d4489f9d4c..4005887a01 100644
--- a/src/func.c
+++ b/src/func.c
@@ -911,7 +911,7 @@ static void trimFunc(
     flags = SQLITE_PTR_TO_INT(sqlite3_user_data(context));
     if( flags & 1 ){
       while( nIn>0 ){
-        int len;
+        int len = 0;                   /* Initialized to placate warning. */
         for(i=0; i<nChar; i++){
           len = aLen[i];
           if( memcmp(zIn, azChar[i], len)==0 ) break;
@@ -923,7 +923,7 @@ static void trimFunc(
     }
     if( flags & 2 ){
       while( nIn>0 ){
-        int len;
+        int len = 0;                   /* Initialized to placate warning. */
         for(i=0; i<nChar; i++){
           len = aLen[i];
           if( len<=nIn && memcmp(&zIn[nIn-len],azChar[i],len)==0 ) break;
diff --git a/src/insert.c b/src/insert.c
index 9a3d46f1b3..539877aa0f 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -388,14 +388,14 @@ void sqlite3Insert(
   int appendFlag = 0;   /* True if the insert is likely to be an append */
 
   /* Register allocations */
-  int regFromSelect;    /* Base register for data coming from SELECT */
+  int regFromSelect = 0;/* Base register for data coming from SELECT */
   int regAutoinc = 0;   /* Register holding the AUTOINCREMENT counter */
   int regRowCount = 0;  /* Memory cell used for the row counter */
   int regIns;           /* Block of regs holding rowid+data being inserted */
   int regRowid;         /* registers holding insert rowid */
   int regData;          /* register holding first column to insert */
   int regRecord;        /* Holds the assemblied row record */
-  int regEof;           /* Register recording end of SELECT data */
+  int regEof = 0;       /* Register recording end of SELECT data */
   int *aRegIdx = 0;     /* One register allocated to each index */
 
 
@@ -1095,7 +1095,8 @@ void sqlite3GenerateConstraintChecks(
   Vdbe *v;
   int nCol;
   int onError;
-  int j1, j2, j3;     /* Addresses of jump instructions */
+  int j1, j3;         /* Addresses of jump instructions */
+  int j2 = 0;         /* Initialized to placate warning */
   int regData;        /* Register containing first data column */
   int iCur;
   Index *pIdx;
diff --git a/src/pager.c b/src/pager.c
index bf33514adf..13cfcbf15d 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -3655,7 +3655,7 @@ static int pagerAllocatePage(Pager *pPager, PgHdr **ppPg){
    || MEMDB
    || (pPager->lru.pFirstSynced==0 && pPager->doNotSync)
   ){
-    void *pData;
+    void *pData = 0;                   /* Initialized to placate warning */
     if( pPager->nPage>=pPager->nHash ){
       pager_resize_hash_table(pPager,
          pPager->nHash<256 ? 256 : pPager->nHash*2);
diff --git a/src/printf.c b/src/printf.c
index b88a7d8d0b..fdf47e9242 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -247,7 +247,7 @@ void sqlite3VXPrintf(
   char buf[etBUFSIZE];       /* Conversion buffer */
   char prefix;               /* Prefix character.  "+" or "-" or " " or '\0'. */
   etByte errorflag = 0;      /* True if an error is encountered */
-  etByte xtype;              /* Conversion paradigm */
+  etByte xtype = 0;          /* Conversion paradigm */
   char *zExtra;              /* Extra memory used for etTCLESCAPE conversions */
 #ifndef SQLITE_OMIT_FLOATING_POINT
   int  exp, e2;              /* exponent of real numbers */
diff --git a/src/select.c b/src/select.c
index 5a8ddf097b..66f0f03354 100644
--- a/src/select.c
+++ b/src/select.c
@@ -2467,7 +2467,7 @@ static int multiSelectOrderBy(
   int regOutA;          /* Address register for the output-A subroutine */
   int regOutB;          /* Address register for the output-B subroutine */
   int addrOutA;         /* Address of the output-A subroutine */
-  int addrOutB;         /* Address of the output-B subroutine */
+  int addrOutB = 0;     /* Address of the output-B subroutine */
   int addrEofA;         /* Address of the select-A-exhausted subroutine */
   int addrEofB;         /* Address of the select-B-exhausted subroutine */
   int addrAltB;         /* Address of the A<B subroutine */
@@ -2482,7 +2482,7 @@ static int multiSelectOrderBy(
   int labelEnd;         /* Label for the end of the overall SELECT stmt */
   int j1;               /* Jump instructions that get retargetted */
   int op;               /* One of TK_ALL, TK_UNION, TK_EXCEPT, TK_INTERSECT */
-  KeyInfo *pKeyDup;     /* Comparison information for duplicate removal */
+  KeyInfo *pKeyDup = 0; /* Comparison information for duplicate removal */
   KeyInfo *pKeyMerge;   /* Comparison information for merging rows */
   sqlite3 *db;          /* Database connection */
   ExprList *pOrderBy;   /* The ORDER BY clause */
diff --git a/src/update.c b/src/update.c
index 7647d4a7e2..ca8d1369cc 100644
--- a/src/update.c
+++ b/src/update.c
@@ -109,10 +109,10 @@ void sqlite3Update(
   int isView;                  /* Trying to update a view */
   int triggers_exist = 0;      /* True if any row triggers exist */
 #endif
-  int iBeginAfterTrigger;      /* Address of after trigger program */
-  int iEndAfterTrigger;        /* Exit of after trigger program */
-  int iBeginBeforeTrigger;     /* Address of before trigger program */
-  int iEndBeforeTrigger;       /* Exit of before trigger program */
+  int iBeginAfterTrigger = 0;  /* Address of after trigger program */
+  int iEndAfterTrigger = 0;    /* Exit of after trigger program */
+  int iBeginBeforeTrigger = 0; /* Address of before trigger program */
+  int iEndBeforeTrigger = 0;   /* Exit of before trigger program */
   u32 old_col_mask = 0;        /* Mask of OLD.* columns in use */
   u32 new_col_mask = 0;        /* Mask of NEW.* columns in use */
 
diff --git a/src/util.c b/src/util.c
index 919452c572..794179d13a 100644
--- a/src/util.c
+++ b/src/util.c
@@ -655,7 +655,7 @@ int sqlite3GetVarint(const unsigned char *p, u64 *v){
   /* a: p2<<28 | p4<<14 | p6 (unmasked) */
   if (!(a&0x80))
   {
-    a &= (0x7f<<28)|(0x7f<<14)|(0x7f);
+    a &= (0x0f<<28)|(0x7f<<14)|(0x7f);
     b &= (0x7f<<14)|(0x7f);
     b = b<<7;
     a |= b;
@@ -672,7 +672,7 @@ int sqlite3GetVarint(const unsigned char *p, u64 *v){
   /* b: p3<<28 | p5<<14 | p7 (unmasked) */
   if (!(b&0x80))
   {
-    b &= (0x7f<<28)|(0x7f<<14)|(0x7f);
+    b &= (0x0f<<28)|(0x7f<<14)|(0x7f);
     /* moved CSE2 up */
     /* a &= (0x7f<<14)|(0x7f); */
     a = a<<7;
@@ -767,8 +767,8 @@ int sqlite3GetVarint32(const unsigned char *p, u32 *v){
   /* a: p0<<28 | p2<<14 | p4 (unmasked) */
   if (!(a&0x80))
   {
-    a &= (0x7f<<28)|(0x7f<<14)|(0x7f);
-    b &= (0x7f<<28)|(0x7f<<14)|(0x7f);
+    a &= (0x0f<<28)|(0x7f<<14)|(0x7f);
+    b &= (0x0f<<28)|(0x7f<<14)|(0x7f);
     b = b<<7;
     *v = a | b;
     return 5;
diff --git a/src/vdbe.c b/src/vdbe.c
index b326c79c07..43f59f1965 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -543,8 +543,10 @@ int sqlite3VdbeExec(
   int rc = SQLITE_OK;        /* Value to return */
   sqlite3 *db = p->db;       /* The database */
   u8 encoding = ENC(db);     /* The database encoding */
-  Mem *pIn1, *pIn2, *pIn3;   /* Input operands */
-  Mem *pOut;                 /* Output operand */
+  Mem *pIn1 = 0;             /* Input operands */
+  Mem *pIn2 = 0;             /* Input operands */
+  Mem *pIn3 = 0;             /* Input operands */
+  Mem *pOut = 0;             /* Output operand */
   u8 opProperty;
   int iCompare = 0;          /* Result of last OP_Compare operation */
   int *aPermute = 0;         /* Permuation of columns for OP_Compare */
@@ -3532,7 +3534,7 @@ case OP_Insert: {
 */
 case OP_Delete: {
   int i = pOp->p1;
-  i64 iKey;
+  i64 iKey = 0;
   Cursor *pC;
 
   assert( i>=0 && i<p->nCursor );
diff --git a/test/varint.test b/test/varint.test
index 974e88f2a6..fd0ec0d415 100644
--- a/test/varint.test
+++ b/test/varint.test
@@ -30,3 +30,5 @@ foreach start {0 100 10000 1000000 0x10000000} {
     }
   }
 }
+
+finish_test