commit 7f906d63ff8769b48ae22cb9fe24182a74eef8b4
author drh <drh@noemail.net> Mon Mar 12 23:48:52 2007 +0000
committer drh <drh@noemail.net> Mon Mar 12 23:48:52 2007 +0000
tree 09a3fc71257195d3c5cdf15534b82af8a2b2c907
parent 280801e2d1fb0f8411efe0c5d49727e78f99f673

Clarify the use of loop variables in a expr.c. (CVS 3683)

FossilOrigin-Name: e20e76f6d8578f4faab0b101b6d4deb2a8987454

src/expr.c

diff --git a/src/expr.c b/src/expr.c
index 6724b39..f5d876e 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -12,7 +12,7 @@
 ** This file contains routines used for analyzing expressions and
 ** for generating VDBE code that evaluates expressions in SQLite.
 **
-** $Id: expr.c,v 1.280 2007/02/24 15:29:04 drh Exp $
+** $Id: expr.c,v 1.281 2007/03/12 23:48:53 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -2288,15 +2288,16 @@
             ** Make an entry for the column in pAggInfo->aCol[] if there
             ** is not an entry there already.
             */
+            int k;
             pCol = pAggInfo->aCol;
-            for(i=0; i<pAggInfo->nColumn; i++, pCol++){
+            for(k=0; k<pAggInfo->nColumn; k++, pCol++){
               if( pCol->iTable==pExpr->iTable &&
                   pCol->iColumn==pExpr->iColumn ){
                 break;
               }
             }
-            if( i>=pAggInfo->nColumn && (i = addAggInfoColumn(pAggInfo))>=0 ){
-              pCol = &pAggInfo->aCol[i];
+            if( k>=pAggInfo->nColumn && (k = addAggInfoColumn(pAggInfo))>=0 ){
+              pCol = &pAggInfo->aCol[k];
               pCol->pTab = pExpr->pTab;
               pCol->iTable = pExpr->iTable;
               pCol->iColumn = pExpr->iColumn;
@@ -2328,7 +2329,7 @@
             */
             pExpr->pAggInfo = pAggInfo;
             pExpr->op = TK_AGG_COLUMN;
-            pExpr->iAgg = i;
+            pExpr->iAgg = k;
             break;
           } /* endif pExpr->iTable==pItem->iCursor */
         } /* end loop over pSrcList */