/ Check-in [a1ad7fb3]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix a harmless compiler warning (a shadowed local variable) in analyze.c.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: a1ad7fb38bb38909ca2fddee31c7a8001f10686f
User & Date: drh 2011-01-24 19:14:06
Context
2011-01-24
19:45
Fix a typo in the documentation for sqlite3_snprintf(). No changes to code. check-in: 8d106541 user: drh tags: trunk
19:14
Fix a harmless compiler warning (a shadowed local variable) in analyze.c. check-in: a1ad7fb3 user: drh tags: trunk
2011-01-22
13:32
Modify the trace callback mechanism so that SQL commands executed from within virtual table or user function callbacks are passed to the trace callback without parameter expansion and enclosed in SQL comments. check-in: a764915b user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/analyze.c.

   282    282         ** passed as the second argument to the call to sqlite3VdbeJumpHere() 
   283    283         ** below may be negative. Which causes an assert() to fail (or an
   284    284         ** out-of-bounds write if SQLITE_DEBUG is not defined).  */
   285    285         return;
   286    286       }
   287    287       sqlite3VdbeAddOp2(v, OP_Goto, 0, endOfLoop);
   288    288       for(i=0; i<nCol; i++){
   289         -      int addr = sqlite3VdbeCurrentAddr(v) - (nCol*2);
          289  +      int addr2 = sqlite3VdbeCurrentAddr(v) - (nCol*2);
   290    290         if( i==0 ){
   291         -        sqlite3VdbeJumpHere(v, addr-1);  /* Set jump dest for the OP_IfNot */
          291  +        sqlite3VdbeJumpHere(v, addr2-1);  /* Set jump dest for the OP_IfNot */
   292    292         }
   293         -      sqlite3VdbeJumpHere(v, addr);      /* Set jump dest for the OP_Ne */
          293  +      sqlite3VdbeJumpHere(v, addr2);      /* Set jump dest for the OP_Ne */
   294    294         sqlite3VdbeAddOp2(v, OP_AddImm, iMem+i+1, 1);
   295    295         sqlite3VdbeAddOp3(v, OP_Column, iIdxCur, i, iMem+nCol+i+1);
   296    296       }
   297    297   
   298    298       /* End of the analysis loop. */
   299    299       sqlite3VdbeResolveLabel(v, endOfLoop);
   300    300       sqlite3VdbeAddOp2(v, OP_Next, iIdxCur, topOfLoop);