diff options
| author | drh <drh@noemail.net> | 2014-03-05 23:12:55 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-03-05 23:12:55 +0000 |
| commit | 3bde1354ff995a17adbdd09bc55bc2bf67220966 (patch) | |
| tree | d872e2108d308d9d85c18ea55ba53b07092f8928 /src | |
| parent | 0503cf491fe8e69ed89fbc4ec390e1378f5c376e (diff) | |
| parent | dc90d3d8af0c560869ce2dd1ed576ff6745ac58c (diff) | |
| download | sqlite-3bde1354ff995a17adbdd09bc55bc2bf67220966.tar.gz sqlite-3bde1354ff995a17adbdd09bc55bc2bf67220966.zip | |
Merge compiler-warning fixes from trunk.
FossilOrigin-Name: a1f2b0428518ec18af74a0e01deb4e40cd95a78f
Diffstat (limited to 'src')
| -rw-r--r-- | src/build.c | 6 | ||||
| -rw-r--r-- | src/ctime.c | 3 | ||||
| -rw-r--r-- | src/sqliteInt.h | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/build.c b/src/build.c index 5b6c87f22..10077e501 100644 --- a/src/build.c +++ b/src/build.c @@ -3473,7 +3473,7 @@ SrcList *sqlite3SrcListEnlarge( assert( iStart<=pSrc->nSrc ); /* Allocate additional space if needed */ - if( pSrc->nSrc+nExtra>pSrc->nAlloc ){ + if( (u32)pSrc->nSrc+nExtra>pSrc->nAlloc ){ SrcList *pNew; int nAlloc = pSrc->nSrc+nExtra; int nGot; @@ -3485,7 +3485,7 @@ SrcList *sqlite3SrcListEnlarge( } pSrc = pNew; nGot = (sqlite3DbMallocSize(db, pNew) - sizeof(*pSrc))/sizeof(pSrc->a[0])+1; - pSrc->nAlloc = (u8)nGot; + pSrc->nAlloc = nGot; } /* Move existing slots that come after the newly inserted slots @@ -3493,7 +3493,7 @@ SrcList *sqlite3SrcListEnlarge( for(i=pSrc->nSrc-1; i>=iStart; i--){ pSrc->a[i+nExtra] = pSrc->a[i]; } - pSrc->nSrc += (i8)nExtra; + pSrc->nSrc += nExtra; /* Zero the newly allocated slots */ memset(&pSrc->a[iStart], 0, sizeof(pSrc->a[0])*nExtra); diff --git a/src/ctime.c b/src/ctime.c index c863cbed5..286f66e06 100644 --- a/src/ctime.c +++ b/src/ctime.c @@ -215,6 +215,9 @@ static const char * const azCompileOpt[] = { #ifdef SQLITE_OMIT_COMPOUND_SELECT "OMIT_COMPOUND_SELECT", #endif +#ifdef SQLITE_OMIT_CTE + "OMIT_CTE", +#endif #ifdef SQLITE_OMIT_DATETIME_FUNCS "OMIT_DATETIME_FUNCS", #endif diff --git a/src/sqliteInt.h b/src/sqliteInt.h index d07a27d97..69a61ad5a 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -2026,8 +2026,8 @@ typedef u64 Bitmask; ** contains more than 63 columns and the 64-th or later column is used. */ struct SrcList { - u8 nSrc; /* Number of tables or subqueries in the FROM clause */ - u8 nAlloc; /* Number of entries allocated in a[] below */ + int nSrc; /* Number of tables or subqueries in the FROM clause */ + u32 nAlloc; /* Number of entries allocated in a[] below */ struct SrcList_item { Schema *pSchema; /* Schema to which this item is fixed */ char *zDatabase; /* Name of database holding this table */ |