Fixed warnings that only appeared when compiling amd64 binaries

This commit is contained in:
Scott Ehlert
2006-08-27 04:50:20 +00:00
parent 22bef17660
commit 709b3705ab
5 changed files with 547 additions and 549 deletions

View File

@ -146,7 +146,7 @@ int sqlite3_get_table(
rc = sqlite3_exec(db, zSql, sqlite3_get_table_cb, &res, pzErrMsg);
if( res.azResult ){
assert( sizeof(res.azResult[0])>= sizeof(res.nData) );
res.azResult[0] = (char*)res.nData;
res.azResult[0] = (void *)(long)res.nData;
}
if( rc==SQLITE_ABORT ){
sqlite3_free_table(&res.azResult[1]);
@ -191,7 +191,7 @@ void sqlite3_free_table(
int i, n;
azResult--;
if( azResult==0 ) return;
n = (int)azResult[0];
n = (int)(long)azResult[0];
for(i=1; i<n; i++){ if( azResult[i] ) free(azResult[i]); }
free(azResult);
}

View File

@ -776,7 +776,7 @@ const void *sqlite3ValueText(sqlite3_value* pVal, u8 enc){
pVal->flags |= (pVal->flags & MEM_Blob)>>3;
if( pVal->flags&MEM_Str ){
sqlite3VdbeChangeEncoding(pVal, enc & ~SQLITE_UTF16_ALIGNED);
if( (enc & SQLITE_UTF16_ALIGNED)!=0 && 1==(1&(int)pVal->z) ){
if( (enc & SQLITE_UTF16_ALIGNED)!=0 && 1==(1&(long)pVal->z) ){
assert( (pVal->flags & (MEM_Ephem|MEM_Static))!=0 );
if( sqlite3VdbeMemMakeWriteable(pVal)!=SQLITE_OK ){
return 0;