Warning cleanup from the MSVC compile.
FossilOrigin-Name: 26cd015c0ee1c18dd37f11b47ce35cfa320b3514
diff --git a/src/analyze.c b/src/analyze.c
index 273856d..01b4ad4 100644
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -49,7 +49,7 @@
};
int aRoot[] = {0, 0};
- int aCreateTbl[] = {0, 0};
+ u8 aCreateTbl[] = {0, 0};
int i;
sqlite3 *db = pParse->db;
@@ -506,6 +506,8 @@
sqlite3DbFree(dbMem, pIdx->aSample);
pIdx->aSample = 0;
}
+#else
+ UNUSED_PARAMETER(pIdx);
#endif
}
@@ -609,7 +611,7 @@
assert( pIdx->aSample );
{
IndexSample *pSample = &pIdx->aSample[iSample];
- pSample->eType = eType;
+ pSample->eType = (u8)eType;
if( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT ){
pSample->u.r = sqlite3_column_double(pStmt, 2);
}else if( eType==SQLITE_TEXT || eType==SQLITE_BLOB ){
@@ -622,7 +624,7 @@
if( n>24 ){
n = 24;
}
- pSample->nByte = n;
+ pSample->nByte = (u8)n;
pSample->u.z = sqlite3DbMallocRaw(dbMem, n);
if( pSample->u.z ){
memcpy(pSample->u.z, z, n);
diff --git a/src/callback.c b/src/callback.c
index 0d4f9dd..492e420 100644
--- a/src/callback.c
+++ b/src/callback.c
@@ -83,7 +83,7 @@
*/
CollSeq *sqlite3GetCollSeq(
sqlite3* db, /* The database connection */
- int enc, /* The desired encoding for the collating sequence */
+ u8 enc, /* The desired encoding for the collating sequence */
CollSeq *pColl, /* Collating sequence with native encoding, or NULL */
const char *zName /* Collating sequence name */
){
diff --git a/src/main.c b/src/main.c
index 9bc4619..e4324e7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1359,8 +1359,8 @@
static int createCollation(
sqlite3* db,
const char *zName,
- int enc,
- int collType,
+ u8 enc,
+ u8 collType,
void* pCtx,
int(*xCompare)(void*,int,const void*,int,const void*),
void(*xDel)(void*)
@@ -1808,7 +1808,7 @@
int rc;
sqlite3_mutex_enter(db->mutex);
assert( !db->mallocFailed );
- rc = createCollation(db, zName, enc, SQLITE_COLL_USER, pCtx, xCompare, 0);
+ rc = createCollation(db, zName, (u8)enc, SQLITE_COLL_USER, pCtx, xCompare, 0);
rc = sqlite3ApiExit(db, rc);
sqlite3_mutex_leave(db->mutex);
return rc;
@@ -1828,7 +1828,7 @@
int rc;
sqlite3_mutex_enter(db->mutex);
assert( !db->mallocFailed );
- rc = createCollation(db, zName, enc, SQLITE_COLL_USER, pCtx, xCompare, xDel);
+ rc = createCollation(db, zName, (u8)enc, SQLITE_COLL_USER, pCtx, xCompare, xDel);
rc = sqlite3ApiExit(db, rc);
sqlite3_mutex_leave(db->mutex);
return rc;
@@ -1851,7 +1851,7 @@
assert( !db->mallocFailed );
zName8 = sqlite3Utf16to8(db, zName, -1);
if( zName8 ){
- rc = createCollation(db, zName8, enc, SQLITE_COLL_USER, pCtx, xCompare, 0);
+ rc = createCollation(db, zName8, (u8)enc, SQLITE_COLL_USER, pCtx, xCompare, 0);
sqlite3DbFree(db, zName8);
}
rc = sqlite3ApiExit(db, rc);
diff --git a/src/resolve.c b/src/resolve.c
index 857b67d..4090bdd 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -261,7 +261,7 @@
testcase( iCol==32 );
pParse->oldmask |= (iCol>=32 ? 0xffffffff : (((u32)1)<<iCol));
}
- pExpr->iColumn = iCol;
+ pExpr->iColumn = (i16)iCol;
pExpr->pTab = pTab;
isTrigger = 1;
}
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index a8a1da6..c77721b 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -2805,7 +2805,7 @@
sqlite3_value *sqlite3ValueNew(sqlite3 *);
char *sqlite3Utf16to8(sqlite3 *, const void*, int);
#ifdef SQLITE_ENABLE_STAT2
-char *sqlite3Utf8to16(sqlite3 *, int, char *, int, int *);
+char *sqlite3Utf8to16(sqlite3 *, u8, char *, int, int *);
#endif
int sqlite3ValueFromExpr(sqlite3 *, Expr *, u8, u8, sqlite3_value **);
void sqlite3ValueApplyAffinity(sqlite3_value *, u8, u8);
@@ -2831,7 +2831,7 @@
void sqlite3ColumnDefault(Vdbe *, Table *, int, int);
void sqlite3AlterFinishAddColumn(Parse *, Token *);
void sqlite3AlterBeginAddColumn(Parse *, SrcList *);
-CollSeq *sqlite3GetCollSeq(sqlite3*, int, CollSeq *, const char*);
+CollSeq *sqlite3GetCollSeq(sqlite3*, u8, CollSeq *, const char*);
char sqlite3AffinityType(const char*);
void sqlite3Analyze(Parse*, Token*, Token*);
int sqlite3InvokeBusyHandler(BusyHandler*);
diff --git a/src/trigger.c b/src/trigger.c
index e17b48e..00acc81 100644
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -695,7 +695,7 @@
** INSERT INTO t1 ... ; -- insert into t2 uses REPLACE policy
** INSERT OR IGNORE INTO t1 ... ; -- insert into t2 uses IGNORE policy
*/
- pParse->eOrconf = (orconf==OE_Default)?pStep->orconf:orconf;
+ pParse->eOrconf = (orconf==OE_Default)?pStep->orconf:(u8)orconf;
switch( pStep->op ){
case TK_UPDATE: {
@@ -955,6 +955,8 @@
){
Trigger *p;
+ UNUSED_PARAMETER(newIdx);
+
assert(op == TK_UPDATE || op == TK_INSERT || op == TK_DELETE);
assert(tr_tm == TRIGGER_BEFORE || tr_tm == TRIGGER_AFTER );
diff --git a/src/update.c b/src/update.c
index 8015b04..ba1ad91 100644
--- a/src/update.c
+++ b/src/update.c
@@ -127,7 +127,7 @@
int regOldRowid; /* The old rowid */
int regNewRowid; /* The new rowid */
int regNew;
- int regOld;
+ int regOld = 0;
int regRowSet = 0; /* Rowset of rows to be updated */
int regRec; /* Register used for new table record to insert */
diff --git a/src/utf.c b/src/utf.c
index 159ac90..c3d07be 100644
--- a/src/utf.c
+++ b/src/utf.c
@@ -465,7 +465,7 @@
** flag set.
*/
#ifdef SQLITE_ENABLE_STAT2
-char *sqlite3Utf8to16(sqlite3 *db, int enc, char *z, int n, int *pnOut){
+char *sqlite3Utf8to16(sqlite3 *db, u8 enc, char *z, int n, int *pnOut){
Mem m;
memset(&m, 0, sizeof(m));
m.db = db;
diff --git a/src/vdbe.c b/src/vdbe.c
index e6b325a..dd2ff7b 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -4863,7 +4863,7 @@
p->pFrame = pFrame;
p->aMem = &VdbeFrameMem(pFrame)[-1];
p->nMem = pFrame->nChildMem;
- p->nCursor = pFrame->nChildCsr;
+ p->nCursor = (u16)pFrame->nChildCsr;
p->apCsr = (VdbeCursor **)&p->aMem[p->nMem+1];
p->aOp = pProgram->aOp;
p->nOp = pProgram->nOp;
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 546c16f..efbf6b1 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -2761,6 +2761,8 @@
u32 lenRowid; /* Size of the rowid */
Mem m, v;
+ UNUSED_PARAMETER(db);
+
/* Get the size of the index entry. Only indices entries of less
** than 2GiB are support - anything large must be database corruption.
** Any corruption is detected in sqlite3BtreeParseCellPtr(), though, so
diff --git a/src/where.c b/src/where.c
index f23133b..9859ab5 100644
--- a/src/where.c
+++ b/src/where.c
@@ -2357,7 +2357,7 @@
nRow = (double)(aiRowEst[nEq] * nInMul);
if( bInEst && nRow*2>aiRowEst[0] ){
nRow = aiRowEst[0]/2;
- nInMul = nRow / aiRowEst[nEq];
+ nInMul = (int)(nRow / aiRowEst[nEq]);
}
/* Assume constant cost to access a row and logarithmic cost to