aboutsummaryrefslogtreecommitdiff
path: root/src/malloc.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2008-12-10 21:19:56 +0000
committerdrh <drh@noemail.net>2008-12-10 21:19:56 +0000
commit1bd10f8a0063bcbcb75b99f48e70ae312e145aae (patch)
tree457c8297dbebfb90dcbb5af39ed8858cfc73be48 /src/malloc.c
parent00c586a23885f14f39bb35f7c6167f0bdc62f391 (diff)
downloadsqlite-1bd10f8a0063bcbcb75b99f48e70ae312e145aae.tar.gz
sqlite-1bd10f8a0063bcbcb75b99f48e70ae312e145aae.zip
Additional work at eliminating silly compiler warnings. (CVS 6010)
FossilOrigin-Name: ea01d43788a75e39c7f03c22681d1a338d52cf0e
Diffstat (limited to 'src/malloc.c')
-rw-r--r--src/malloc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/malloc.c b/src/malloc.c
index 1950e048b..ba0122df6 100644
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -12,7 +12,7 @@
**
** Memory allocation functions used throughout sqlite.
**
-** $Id: malloc.c,v 1.50 2008/12/10 19:26:24 drh Exp $
+** $Id: malloc.c,v 1.51 2008/12/10 21:19:57 drh Exp $
*/
#include "sqliteInt.h"
#include <stdarg.h>
@@ -50,7 +50,7 @@ void sqlite3_soft_heap_limit(int n){
}else{
sqlite3MemoryAlarm(0, 0, 0);
}
- overage = sqlite3_memory_used() - n;
+ overage = (int)(sqlite3_memory_used() - (i64)n);
if( overage>0 ){
sqlite3_release_memory(overage);
}
@@ -385,7 +385,7 @@ void sqlite3ScratchFree(void *p){
}
}else{
int i;
- i = (u8 *)p - (u8 *)sqlite3GlobalConfig.pScratch;
+ i = (int)((u8*)p - (u8*)sqlite3GlobalConfig.pScratch);
i /= sqlite3GlobalConfig.szScratch;
assert( i>=0 && i<sqlite3GlobalConfig.nScratch );
sqlite3_mutex_enter(mem0.mutex);