From: mistachkin <mistachkin@noemail.net>
Date: Fri, 5 Jan 2018 17:10:49 +0000 (+0000)
Subject: Fix compiler warnings.
X-Git-Tag: version-3.22.0~108^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a5efdec7079a7f8a548631d5958b9f6f4a04b54;p=thirdparty%2Fsqlite.git

Fix compiler warnings.

FossilOrigin-Name: 19aabccfe34c956599f33cd3ddc846816adc06784c2496838f1ef53059e038e5
---

diff --git a/ext/fts5/fts5_tcl.c b/ext/fts5/fts5_tcl.c
index e8d4c32a46..8f79397fbf 100644
--- a/ext/fts5/fts5_tcl.c
+++ b/ext/fts5/fts5_tcl.c
@@ -433,7 +433,7 @@ static int SQLITE_TCLAPI xF5tApi(
       int iVal;
       int bClear;
       if( Tcl_GetBooleanFromObj(interp, objv[2], &bClear) ) return TCL_ERROR;
-      iVal = ((char*)p->pApi->xGetAuxdata(p->pFts, bClear) - (char*)0);
+      iVal = (int)((char*)p->pApi->xGetAuxdata(p->pFts, bClear) - (char*)0);
       Tcl_SetObjResult(interp, Tcl_NewIntObj(iVal));
       break;
     }
diff --git a/ext/misc/fileio.c b/ext/misc/fileio.c
index f6df42f98e..796bee399c 100644
--- a/ext/misc/fileio.c
+++ b/ext/misc/fileio.c
@@ -93,6 +93,7 @@ SQLITE_EXTENSION_INIT1
 #  include "test_windirent.h"
 #  define dirent DIRENT
 #  define timespec TIMESPEC
+#  define stat _stat
 #  define mkdir(path,mode) _mkdir(path)
 #  define lstat(path,buf) _stat(path,buf)
 #endif
diff --git a/ext/misc/unionvtab.c b/ext/misc/unionvtab.c
index 14cce84510..92d0b833c4 100644
--- a/ext/misc/unionvtab.c
+++ b/ext/misc/unionvtab.c
@@ -799,7 +799,7 @@ static void unionConfigureVtab(
       zVal = zOpt;
       if( *zVal==':' ) zVal++;
       while( union_isidchar(*zVal) ) zVal++;
-      nOpt = zVal-zOpt;
+      nOpt = (int)(zVal-zOpt);
 
       while( union_isspace(*zVal) ) zVal++;
       if( *zVal=='=' ){
diff --git a/ext/misc/zipfile.c b/ext/misc/zipfile.c
index c3dc5f2d3e..d2715c4400 100644
--- a/ext/misc/zipfile.c
+++ b/ext/misc/zipfile.c
@@ -299,7 +299,7 @@ static int zipfileConnect(
 
   if( argc>3 ){
     zFile = argv[3];
-    nFile = strlen(zFile)+1;
+    nFile = (int)strlen(zFile)+1;
   }
 
   rc = sqlite3_declare_vtab(db, ZIPFILE_SCHEMA);
@@ -1049,7 +1049,7 @@ static int zipfileAppendEntry(
   zipfileWrite16(aBuf, (u16)nPath);
   zipfileWrite16(aBuf, pCds->nExtra);
   assert( aBuf==&pTab->aBuffer[ZIPFILE_LFH_FIXED_SZ] );
-  rc = zipfileAppendData(pTab, pTab->aBuffer, aBuf - pTab->aBuffer);
+  rc = zipfileAppendData(pTab, pTab->aBuffer, (int)(aBuf - pTab->aBuffer));
   if( rc==SQLITE_OK ){
     rc = zipfileAppendData(pTab, (const u8*)zPath, nPath);
   }
@@ -1140,7 +1140,7 @@ static int zipfileUpdate(
   }
 
   zPath = (const char*)sqlite3_value_text(apVal[2]);
-  nPath = strlen(zPath);
+  nPath = (int)strlen(zPath);
   rc = zipfileGetMode(pTab, apVal[3], &mode);
   if( rc!=SQLITE_OK ) return rc;
   mTime = sqlite3_value_int64(apVal[4]);
@@ -1227,7 +1227,7 @@ static int zipfileAppendEOCD(ZipfileTab *pTab, ZipfileEOCD *p){
   zipfileWrite16(aBuf, 0);        /* Size of trailing comment in bytes*/
 
   assert( (aBuf-pTab->aBuffer)==22 );
-  return zipfileAppendData(pTab, pTab->aBuffer, aBuf - pTab->aBuffer);
+  return zipfileAppendData(pTab, pTab->aBuffer, (int)(aBuf - pTab->aBuffer));
 }
 
 static void zipfileCleanupTransaction(ZipfileTab *pTab){
diff --git a/manifest b/manifest
index 9f339b15a4..fd16cab107 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\smissing\sdependencies\sfor\sshell.c\sin\sall\smakefiles.
-D 2018-01-05T16:23:43.149
+C Fix\scompiler\swarnings.
+D 2018-01-05T17:10:49.665
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in f5c6285ac43b2e567d6cf463dff3744da960a19f2cf141744b4472842a97681e
@@ -116,7 +116,7 @@ F ext/fts5/fts5_hash.c 32be400cf761868c9db33efe81a06eb19a17c5402ad477ee9efb51301
 F ext/fts5/fts5_index.c 5fe14375a29e8a7aa8f3e863babe180a19269206c254c8f47b216821d4ac1e15
 F ext/fts5/fts5_main.c 24868f88ab2a865defbba7a92eebeb726cc991eb092b71b5f5508f180c72605b
 F ext/fts5/fts5_storage.c fb5ef3c27073f67ade2e1bea08405f9e43f68f5f3676ed0ab7013bce5ba10be6
-F ext/fts5/fts5_tcl.c a7df39442ae674dde877cf06fe02ebb7658e69c179a4d223241c90df4f14b54e
+F ext/fts5/fts5_tcl.c b470467be4c5cab2d8b026992c05d86cd2293e7d8c4a10ba56d5f4f707981097
 F ext/fts5/fts5_test_mi.c 65864ba1e5c34a61d409c4c587e0bbe0466eb4f8f478d85dc42a92caad1338e6
 F ext/fts5/fts5_test_tok.c ffd657dd67e7fcdb31bf63fb60b6d867299a581d0f46e97086abacd66c2a9b26
 F ext/fts5/fts5_tokenize.c 2ce7b44183538ec46b7907726262ee43ffdd39a8
@@ -276,7 +276,7 @@ F ext/misc/compress.c 122faa92d25033d6c3f07c39231de074ab3d2e83
 F ext/misc/csv.c 1a009b93650732e22334edc92459c4630b9fa703397cbb3c8ca279921a36ca11
 F ext/misc/dbdump.c 3509fa6b8932d04e932d6b6b827b6a82ca362781b8e8f3c77336f416793e215e
 F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2
-F ext/misc/fileio.c 864984342ede6775976322a3a2731be5e3a70a2c71557e489e1730bd8ca57dd2
+F ext/misc/fileio.c 1e3694706406fcca3a19d09dde9d01624f1d45f4b9e328f9adf61ffe568467ee
 F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25
 F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
 F ext/misc/json1.c dbe086615b9546c156bf32b9378fc09383b58bd17513b866cfd24c1e15281984
@@ -296,13 +296,13 @@ F ext/misc/spellfix.c 41cf26c6b89fcaa8798ae10ae64d39c1f1d9d6995152e545bd491c1305
 F ext/misc/sqlar.c d355cd8b6e7280d2f61d4737672922acb512a2ab1cee52399ffb88980476e31c
 F ext/misc/stmt.c 6f16443abb3551e3f5813bb13ba19a30e7032830015b0f92fe0c0453045c0a11
 F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512
-F ext/misc/unionvtab.c de36c2c45583d68f99e45b392311967066b02e2651d05697da783698b245b387
+F ext/misc/unionvtab.c 2aa94902ea646e1aaf6c05eac944a14276cddd67735b2ad856030ffffbb6626c
 F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95
 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 d88033b4748db9929a0096f627d3a75e9fe0e11d7a92724a6c1c575d5448cea4
+F ext/misc/zipfile.c 8075df9296beeebc344567927d114c6d3201110a29110013388d233fa7d4fb2c
 F ext/rbu/rbu.c ea7d1b7eb44c123a2a619332e19fe5313500705c4a58aaa1887905c0d83ffc2e
 F ext/rbu/rbu1.test 43836fac8c7179a358eaf38a8a1ef3d6e6285842
 F ext/rbu/rbu10.test 1846519a438697f45e9dcb246908af81b551c29e1078d0304fae83f1fed7e9ee
@@ -1694,7 +1694,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 a33ad33cf031edee273afa4735c8564870465be22962a9c277e4ac43a307ff2c
-R c9a59c27332856c5c3df1bda98801aaa
-U drh
-Z 3de3b81c4ea3d2cc9df2aeeb1cbc4214
+P 45495d3e256fef4d0669754726878ed17248fc781397ebb0421149ee9492f977
+R fdf4e94235537d819e1c48759efffe29
+U mistachkin
+Z 11d1a9bb2052215696c761adb1621865
diff --git a/manifest.uuid b/manifest.uuid
index bb30f4d234..23f6ac3e69 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-45495d3e256fef4d0669754726878ed17248fc781397ebb0421149ee9492f977
\ No newline at end of file
+19aabccfe34c956599f33cd3ddc846816adc06784c2496838f1ef53059e038e5
\ No newline at end of file