Fix a harmless compiler warning (a shadowed local variable) in analyze.c.

FossilOrigin-Name: a1ad7fb38bb38909ca2fddee31c7a8001f10686f

diff --git a/manifest b/manifest
index 61daaed0f0110312958624354380980df7d44443..0d60b8266e445234731bba5a7e58f41f777af89f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Modify\sthe\strace\scallback\smechanism\sso\sthat\sSQL\scommands\sexecuted\sfrom\swithin\svirtual\stable\sor\suser\sfunction\scallbacks\sare\spassed\sto\sthe\strace\scallback\swithout\sparameter\sexpansion\sand\senclosed\sin\sSQL\scomments.
-D 2011-01-22T13:32:30
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Fix\sa\sharmless\scompiler\swarning\s(a\sshadowed\slocal\svariable)\sin\sanalyze.c.
+D 2011-01-24T19:14:06.711
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in de6498556d536ae60bb8bb10e8c1ba011448658c
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -113,7 +116,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
 F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
 F src/alter.c 6a0c176e64a34929a4436048066a84ef4f1445b3
-F src/analyze.c 3af3fdb5edea9e69496b078935a3e6a2a1118b30
+F src/analyze.c a038162344265ac21dfb24b3fcc06c666ebb9c07
 F src/attach.c 252c4f7e36cc219349451ed63e278c60e80b26f3
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 8c39a1ebba1e9dc385519cc4d434c7b0cab6638c
@@ -897,7 +900,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 380f61df0754ceec6b3f6a758d04e951cce8c3d9
-R 90a5119ad79fbdf46155bfdda925f6c3
-U dan
-Z 22ba801a4079136db1b6273b2820344e
+P a764915b87564fa91ee68e9b1f41394ce0f1fc7e
+R 6011b1f56cf7fb8f5d17fa2302863158
+U drh
+Z f19cd078d84fab44dfd272be754d8284
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFNPc+BoxKgR168RlERAmkkAJ42UtOzZ0cpY34FbmH/Mw1FnHouMgCfXf/S
+qOqg2bXMaMBkTm3sXPtNr/E=
+=C1+6
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 302247b035f5bf23d1bd4eade381a0d1303432f8..97b556a1a4b5f97071d1f2d9d6ffe5c3c275e14f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a764915b87564fa91ee68e9b1f41394ce0f1fc7e
\ No newline at end of file
+a1ad7fb38bb38909ca2fddee31c7a8001f10686f
\ No newline at end of file

diff --git a/src/analyze.c b/src/analyze.c
index 3693aad83354981762edbce86a0f590caa8b8ac7..0a8339bafbad32bc2932abcc73022e6a3fb2e71a 100644 (file)
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -286,11 +286,11 @@ static void analyzeOneTable(
     }
     sqlite3VdbeAddOp2(v, OP_Goto, 0, endOfLoop);
     for(i=0; i<nCol; i++){
-      int addr = sqlite3VdbeCurrentAddr(v) - (nCol*2);
+      int addr2 = sqlite3VdbeCurrentAddr(v) - (nCol*2);
       if( i==0 ){
-        sqlite3VdbeJumpHere(v, addr-1);  /* Set jump dest for the OP_IfNot */
+        sqlite3VdbeJumpHere(v, addr2-1);  /* Set jump dest for the OP_IfNot */
       }
-      sqlite3VdbeJumpHere(v, addr);      /* Set jump dest for the OP_Ne */
+      sqlite3VdbeJumpHere(v, addr2);      /* Set jump dest for the OP_Ne */
       sqlite3VdbeAddOp2(v, OP_AddImm, iMem+i+1, 1);
       sqlite3VdbeAddOp3(v, OP_Column, iIdxCur, i, iMem+nCol+i+1);
     }