1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-14 00:22:38 +03:00

More explicit type casting to silence VC++. (CVS 6006)

FossilOrigin-Name: 14e6d19c3157ccdce170e769d678c7f472dd3db2
This commit is contained in:
drh
2008-12-10 18:03:45 +00:00
parent dc5ea5c785
commit b27b7f5d3b
13 changed files with 78 additions and 79 deletions

View File

@@ -12,7 +12,7 @@
** This file contains C code routines that are called by the parser
** to handle SELECT statements in SQLite.
**
** $Id: select.c,v 1.491 2008/12/10 17:20:01 drh Exp $
** $Id: select.c,v 1.492 2008/12/10 18:03:46 drh Exp $
*/
#include "sqliteInt.h"
@@ -2034,7 +2034,7 @@ static int multiSelectOrderBy(
int regOutA; /* Address register for the output-A subroutine */
int regOutB; /* Address register for the output-B subroutine */
int addrOutA; /* Address of the output-A subroutine */
int addrOutB; /* Address of the output-B subroutine */
int addrOutB = 0; /* Address of the output-B subroutine */
int addrEofA; /* Address of the select-A-exhausted subroutine */
int addrEofB; /* Address of the select-B-exhausted subroutine */
int addrAltB; /* Address of the A<B subroutine */
@@ -3539,17 +3539,13 @@ int sqlite3Select(
p->selFlags &= ~SF_Distinct;
}
sqlite3SelectPrep(pParse, p, 0);
pTabList = p->pSrc;
pEList = p->pEList;
if( pParse->nErr || db->mallocFailed ){
goto select_end;
}
p->pOrderBy = pOrderBy;
/* Make local copies of the parameters for this query.
*/
pTabList = p->pSrc;
isAgg = (p->selFlags & SF_Aggregate)!=0;
pEList = p->pEList;
if( pEList==0 ) goto select_end;
/*