database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-08 03:22:21 +03:00
Code Activity

Fix compiler warnings on MSVC build.

Browse Source 
FossilOrigin-Name: 01c4b5b84ec7ce589e20ea66e80011f092ab32f0
This commit is contained in:
shane
2009-11-03 19:42:30 +00:00
parent f16371d650
commit f639c40f77
7 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/expr.c
View File

@@ -571,12 +571,20 @@ void sqlite3ExprAssignVarNumber(Parse *pParse, Expr *pExpr){
if( z[1]==0 ){
/* Wildcard of the form "?". Assign the next variable number */
assert( z[0]=='?' );
#if SQLITE_MAX_VARIABLE_NUMBER<=32767
pExpr->iColumn = (i16)(++pParse->nVar);
#else
pExpr->iColumn = ++pParse->nVar;
#endif
}else if( z[0]=='?' ){
/* Wildcard of the form "?nnn". Convert "nnn" to an integer and
** use it as the variable number */
int i;
pExpr->iColumn = i = atoi((char*)&z[1]);
int i = atoi((char*)&z[1]);
#if SQLITE_MAX_VARIABLE_NUMBER<=32767
pExpr->iColumn = (i16)i;
#else
pExpr->iColumn = i;
#endif
testcase( i==0 );
testcase( i==1 );
testcase( i==db->aLimit[SQLITE_LIMIT_VARIABLE_NUMBER]-1 );
@@ -605,7 +613,11 @@ void sqlite3ExprAssignVarNumber(Parse *pParse, Expr *pExpr){
}
}
if( i>=pParse->nVarExpr ){
#if SQLITE_MAX_VARIABLE_NUMBER<=32767
pExpr->iColumn = (i16)(++pParse->nVar);
#else
pExpr->iColumn = ++pParse->nVar;
#endif
if( pParse->nVarExpr>=pParse->nVarExprAlloc-1 ){
pParse->nVarExprAlloc += pParse->nVarExprAlloc + 10;
pParse->apVarExpr =