From: drh <drh@noemail.net>
Date: Thu, 16 Jul 2015 18:37:53 +0000 (+0000)
Subject: Fix harmless compiler warnings.
X-Git-Tag: version-3.8.11~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=939d4bcd771413378c49547608bc13526bf59990;p=thirdparty%2Fsqlite.git

Fix harmless compiler warnings.

FossilOrigin-Name: 9a592cf91c74b369bacf6a0e69d45f3e73dfdbce
---

diff --git a/manifest b/manifest
index 0ea09a905b..f408f5f761 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Defer\sthe\sbulk\spcache1\smemory\sallocation\suntil\sthe\sfirst\spage\sallocation\nrequest.\s\sLimit\sthe\ssize\sof\sthe\spcache1\sbulk\sallocation\sto\sthe\scache_size\nsetting.\s\sDeallocate\sthe\sbulk\sallocation\son\sa\ssqlite3_db_release_memory()\nrequest,\sif\sthe\sbulk\sallocation\sis\scompletely\sunused.
-D 2015-07-16T18:18:19.580
+C Fix\sharmless\scompiler\swarnings.
+D 2015-07-16T18:37:53.565
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 6e8af213d49e6325bf283ebed7662254f8e15bda
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -319,7 +319,7 @@ F src/pager.h 6d435f563b3f7fcae4b84433b76a6ac2730036e2
 F src/parse.y 6d60dda8f8d418b6dc034f1fbccd816c459983a8
 F src/pcache.c cde06aa50962595e412d497e22fd2e07878ba1f0
 F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9
-F src/pcache1.c 6c1e5957087b74e7e7cff871561849cf2fe09654
+F src/pcache1.c d08939800abf3031bd0affd5a13fbc4d7ba3fb68
 F src/pragma.c e52084b37a08a88f258830518461e94627af2621
 F src/pragma.h 631a91c8b0e6ca8f051a1d8a4a0da4150e04620a
 F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
@@ -1365,7 +1365,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 9c39d4644530ccc532f4ff26464106c6da43269a
-R 09036069f4d0dade4c9d3cbed758be18
+P b79a4affe44bd0c8e155cae19f3f62c715684cd6
+R 46ffb58e9bbf5b7d344569559372c137
 U drh
-Z 38e6769945da8f33e2e2b46c42a73ce6
+Z fc33a5797b3dc2992ffe746880c5611b
diff --git a/manifest.uuid b/manifest.uuid
index f712181dec..9dd0845ea4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b79a4affe44bd0c8e155cae19f3f62c715684cd6
\ No newline at end of file
+9a592cf91c74b369bacf6a0e69d45f3e73dfdbce
\ No newline at end of file
diff --git a/src/pcache1.c b/src/pcache1.c
index 8d74da5c90..187f09f592 100644
--- a/src/pcache1.c
+++ b/src/pcache1.c
@@ -265,18 +265,18 @@ void sqlite3PCacheBufferSetup(void *pBuf, int sz, int n){
 ** true if pCache->pFree ends up containing one or more free pages.
 */
 static int pcache1InitBulk(PCache1 *pCache){
-  int szBulk;
+  i64 szBulk;
   char *zBulk;
   if( pcache1.nInitPage==0 ) return 0;
   /* Do not bother with a bulk allocation if the cache size very small */
   if( pCache->nMax<3 ) return 0;
   sqlite3BeginBenignMalloc();
   if( pcache1.nInitPage>0 ){
-    szBulk = pCache->szAlloc * pcache1.nInitPage;
+    szBulk = pCache->szAlloc * (i64)pcache1.nInitPage;
   }else{
-    szBulk = -1024*pcache1.nInitPage;
+    szBulk = -1024 * (i64)pcache1.nInitPage;
   }
-  if( szBulk > pCache->szAlloc*pCache->nMax ){
+  if( szBulk > pCache->szAlloc*(i64)pCache->nMax ){
     szBulk = pCache->szAlloc*pCache->nMax;
   }
   zBulk = pCache->pBulk = sqlite3Malloc( szBulk );