Fix harmless compiler warnings in the zipfile extension seen with MSVC.

FossilOrigin-Name: 15c587cf6ffc920dc37f67cacb4f0db6a603fb998a22a639f755387910516414

diff --git a/ext/misc/zipfile.c b/ext/misc/zipfile.c
index f88b7e22d65d53b1dfca3c149dd7e406ed8e8fa3..a400ae30e157ad411ca6566637f5db999e27f97b 100644 (file)
--- a/ext/misc/zipfile.c
+++ b/ext/misc/zipfile.c
@@ -737,7 +737,7 @@ static void zipfileMtimeToDos(ZipfileCDS *pCds, u32 mUnixTime){
   int hr, min, sec;
 
   A = (int)((JD - 1867216.25)/36524.25);
-  A = JD + 1 + A - (A/4);
+  A = (int)(JD + 1 + A - (A/4));
   B = A + 1524;
   C = (int)((B - 122.1)/365.25);
   D = (36525*(C&32767))/100;
@@ -1623,7 +1623,7 @@ static int zipfileUpdate(
         pNew->cds.szUncompressed = (u32)sz;
         pNew->cds.iExternalAttr = (mode<<16);
         pNew->cds.iOffset = (u32)pTab->szCurrent;
-        pNew->cds.nFile = nPath;
+        pNew->cds.nFile = (u16)nPath;
         pNew->mUnixTime = (u32)mTime;
         rc = zipfileAppendEntry(pTab, pNew, pData, nData);
         zipfileAddEntry(pTab, pOld, pNew);
@@ -1926,7 +1926,7 @@ void zipfileStep(sqlite3_context *pCtx, int nVal, sqlite3_value **apVal){
   /* Inspect the 'method' parameter. This must be either 0 (store), 8 (use
   ** deflate compression) or NULL (choose automatically).  */
   if( pMethod && SQLITE_NULL!=sqlite3_value_type(pMethod) ){
-    iMethod = sqlite3_value_int64(pMethod);
+    iMethod = (int)sqlite3_value_int64(pMethod);
     if( iMethod!=0 && iMethod!=8 ){
       zErr = sqlite3_mprintf("illegal method value: %d", iMethod);
       rc = SQLITE_ERROR;
@@ -1993,14 +1993,14 @@ void zipfileStep(sqlite3_context *pCtx, int nVal, sqlite3_value **apVal){
   e.cds.iVersionMadeBy = ZIPFILE_NEWENTRY_MADEBY;
   e.cds.iVersionExtract = ZIPFILE_NEWENTRY_REQUIRED;
   e.cds.flags = ZIPFILE_NEWENTRY_FLAGS;
-  e.cds.iCompression = iMethod;
+  e.cds.iCompression = (u16)iMethod;
   zipfileMtimeToDos(&e.cds, (u32)e.mUnixTime);
   e.cds.crc32 = iCrc32;
   e.cds.szCompressed = nData;
   e.cds.szUncompressed = szUncompressed;
   e.cds.iExternalAttr = (mode<<16);
   e.cds.iOffset = p->body.n;
-  e.cds.nFile = nName;
+  e.cds.nFile = (u16)nName;
   e.cds.zFile = zName;
 
   /* Append the LFH to the body of the new archive */
@@ -2047,8 +2047,8 @@ void zipfileFinal(sqlite3_context *pCtx){
   if( p==0 ) return;
   if( p->nEntry>0 ){
     memset(&eocd, 0, sizeof(eocd));
-    eocd.nEntry = p->nEntry;
-    eocd.nEntryTotal = p->nEntry;
+    eocd.nEntry = (u16)p->nEntry;
+    eocd.nEntryTotal = (u16)p->nEntry;
     eocd.nSize = p->cds.n;
     eocd.iOffset = p->body.n;
 

diff --git a/manifest b/manifest
index 8c403db8d8c1885b9dcade2c15e9af4e4a0760f9..a1b96501133c1713a118892b81045560aac68f78 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enable\sthe\sJSON1\sextension\swhen\scompiling\sthe\stest\sfixture\swith\sMSVC.
-D 2018-02-23T13:38:20.020
+C Fix\sharmless\scompiler\swarnings\sin\sthe\szipfile\sextension\sseen\swith\sMSVC.
+D 2018-02-23T13:38:54.742
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in a2d2fb8d17c39ab5ec52beb27850b903949080848236923f436156b72a958737
@@ -304,7 +304,7 @@ F ext/misc/vfsstat.c bf10ef0bc51e1ad6756629e1edb142f7a8db1178
 F ext/misc/vtablog.c 31d0d8f4406795679dcd3a67917c213d3a2a5fb3ea5de35f6e773491ed7e13c9
 F ext/misc/vtshim.c 1976e6dd68dd0d64508c91a6dfab8e75f8aaf6cd
 F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212
-F ext/misc/zipfile.c 3c3e21d0351a44c34c67ca7e833ba04e0de34421b4c9359aa764919ee36b37ef
+F ext/misc/zipfile.c bc88dbf9aa26c24595d158c1398208786ef34e7aee19ea29e8f0110c752fca03
 F ext/misc/zorder.c b0ff58fa643afa1d846786d51ea8d5c4b6b35aa0254ab5a82617db92f3adda64
 F ext/rbu/rbu.c ea7d1b7eb44c123a2a619332e19fe5313500705c4a58aaa1887905c0d83ffc2e
 F ext/rbu/rbu1.test 43836fac8c7179a358eaf38a8a1ef3d6e6285842
@@ -1707,7 +1707,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 4290faf5f7223ebe35b8ed5c4f0ba2444c1764501cabc09a79000f9c1d0890c7
-R 3d31ca3626fb7de7ae6ca98028d90678
+P e9e9f27b3d496531905ad7459cf60366ad3798f507266134dd6388cdec50fdc4
+R 654cd747b1d6661b630741ec0eabab23
 U mistachkin
-Z 415294341d4b98b1263aa22d9cb61bd0
+Z f6be006b93932e4aec25faabbec16d8c

diff --git a/manifest.uuid b/manifest.uuid
index db4761886f66d916ace7a87873b754081edb1223..3218ef0aa68e5f8ce12acd402ab6d37e5674d417 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e9e9f27b3d496531905ad7459cf60366ad3798f507266134dd6388cdec50fdc4
\ No newline at end of file
+15c587cf6ffc920dc37f67cacb4f0db6a603fb998a22a639f755387910516414
\ No newline at end of file