commit cf6973963aabbd79cb4263a3767c99ea4253b86b
author shane <shane@noemail.net> Mon Jun 01 16:53:09 2009 +0000
committer shane <shane@noemail.net> Mon Jun 01 16:53:09 2009 +0000
tree 0ece7905ffd24f122b7e64f8cd8ba88bb8a92910
parent 739a277031a0c2d3ece893f9a8e6277fc7e65f65

Fix compiler warnings with MSVC build. (CVS 6699)

FossilOrigin-Name: 0791588520603d106aa0b8ce24d68b740b7b80c8

src/resolve.c

diff --git a/src/resolve.c b/src/resolve.c
index 55a47ca..e7458cc 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -14,7 +14,7 @@
 ** resolve all identifiers by associating them with a particular
 ** table and column.
 **
-** $Id: resolve.c,v 1.27 2009/05/29 14:39:08 drh Exp $
+** $Id: resolve.c,v 1.28 2009/06/01 16:53:10 shane Exp $
 */
 #include "sqliteInt.h"
 #include <stdlib.h>
@@ -190,7 +190,7 @@
             pMatch = pItem;
             pSchema = pTab->pSchema;
             /* Substitute the rowid (column -1) for the INTEGER PRIMARY KEY */
-            pExpr->iColumn = j==pTab->iPKey ? -1 : j;
+            pExpr->iColumn = j==pTab->iPKey ? -1 : (i16)j;
             if( i<pSrcList->nSrc-1 ){
               if( pItem[1].jointype & JT_NATURAL ){
                 /* If this match occurred in the left table of a natural join,
@@ -246,7 +246,7 @@
         for(iCol=0; iCol < pTab->nCol; iCol++, pCol++) {
           if( sqlite3StrICmp(pCol->zName, zCol)==0 ){
             cnt++;
-            pExpr->iColumn = iCol==pTab->iPKey ? -1 : iCol;
+            pExpr->iColumn = iCol==pTab->iPKey ? -1 : (i16)iCol;
             pExpr->pTab = pTab;
             if( iCol>=0 ){
               testcase( iCol==31 );
@@ -591,6 +591,8 @@
 ){
   int i;             /* Loop counter */
 
+  UNUSED_PARAMETER(pParse);
+
   if( pE->op==TK_ID || (pE->op==TK_STRING && pE->u.zToken[0]!='\'') ){
     char *zCol = pE->u.zToken;
     for(i=0; i<pEList->nExpr; i++){