From: mistachkin <mistachkin@noemail.net>
Date: Fri, 22 Jul 2016 21:26:56 +0000 (+0000)
Subject: Fix harmless compiler warnings seen with MSVC.
X-Git-Tag: version-3.14.0~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80f2b33a12214ca194babd468f2618ed805d2f95;p=thirdparty%2Fsqlite.git

Fix harmless compiler warnings seen with MSVC.

FossilOrigin-Name: 8bb6e6fcedf7d0ae796b8848593106c921ebf21a
---

diff --git a/ext/misc/carray.c b/ext/misc/carray.c
index 6fdbecf575..3c2398ec45 100644
--- a/ext/misc/carray.c
+++ b/ext/misc/carray.c
@@ -247,7 +247,7 @@ static int carrayFilter(
           "unknown datatype: %Q", zType);
         return SQLITE_ERROR;
       }else{
-        pCur->eType = i;
+        pCur->eType = (unsigned char)i;
       }
     }
   }else{
diff --git a/ext/misc/csv.c b/ext/misc/csv.c
index a055a8df13..2a9463bd6e 100644
--- a/ext/misc/csv.c
+++ b/ext/misc/csv.c
@@ -232,7 +232,7 @@ static char *csv_read_one_field(CsvReader *p){
          || (c==EOF && pc=='"')
         ){
           do{ p->n--; }while( p->z[p->n]!='"' );
-          p->cTerm = c;
+          p->cTerm = (char)c;
           break;
         }
         if( pc=='"' && c!='\r' ){
@@ -242,7 +242,7 @@ static char *csv_read_one_field(CsvReader *p){
         if( c==EOF ){
           csv_errmsg(p, "line %d: unterminated %c-quoted field\n",
                      startLine, '"');
-          p->cTerm = c;
+          p->cTerm = (char)c;
           break;
         }
       }
@@ -259,7 +259,7 @@ static char *csv_read_one_field(CsvReader *p){
       p->nLine++;
       if( p->n>0 && p->z[p->n-1]=='\r' ) p->n--;
     }
-    p->cTerm = c;
+    p->cTerm = (char)c;
   }
   if( p->z ) p->z[p->n] = 0;
   return p->z;
@@ -338,9 +338,9 @@ static void csv_trim_whitespace(char *z){
 
 /* Dequote the string */
 static void csv_dequote(char *z){
-  int i, j;
+  int j;
   char cQuote = z[0];
-  size_t n;
+  size_t i, n;
 
   if( cQuote!='\'' && cQuote!='"' ) return;
   n = strlen(z);
@@ -725,7 +725,8 @@ static int csvtabFilter(
   pCur->iRowid = 0;
   if( pCur->rdr.in==0 ){
     assert( pCur->rdr.zIn==pTab->zData );
-    assert( pTab->iStart<=pCur->rdr.nIn );
+    assert( pTab->iStart>=0 );
+    assert( (size_t)pTab->iStart<=pCur->rdr.nIn );
     pCur->rdr.iIn = pTab->iStart;
   }else{
     fseek(pCur->rdr.in, pTab->iStart, SEEK_SET);
diff --git a/manifest b/manifest
index 15a467b95d..718e7796c0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\supper\scase\smodule\snames\sin\sthe\s"sqldiff\s--vtab"\scommand.
-D 2016-07-22T10:09:26.990
+C Fix\sharmless\scompiler\swarnings\sseen\swith\sMSVC.
+D 2016-07-22T21:26:56.199
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -204,10 +204,10 @@ F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
 F ext/icu/icu.c 43df9d8ef2fae7a325100ebd713ab089dc829dd7
 F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
 F ext/misc/amatch.c 211108e201105e4bb0c076527b8cfd34330fc234
-F ext/misc/carray.c 214c9e9d909ceaae3b2f5f917cc2204deca85cc6
+F ext/misc/carray.c b0478416ab01368e40c4e9231c4e15c00a6c1c4c
 F ext/misc/closure.c 0d2a038df8fbae7f19de42e7c7d71f2e4dc88704
 F ext/misc/compress.c 122faa92d25033d6c3f07c39231de074ab3d2e83
-F ext/misc/csv.c f51b0566ea15e24cce871037e30a4db99ea6cf77
+F ext/misc/csv.c 816a3715356e4210dae2d242057745e937050896
 F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2
 F ext/misc/fileio.c d4171c815d6543a9edef8308aab2951413cd8d0f
 F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25
@@ -1506,7 +1506,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 bf98a2de7ed41a8acca89d7369b353f12182cfb4
-R 21feff5d71e42b08ceb5cf54c6ef8c4f
-U dan
-Z 0597e24d7597ffc51d59928722cf37fa
+P 87e25fc472604b3978811be53991104c665a95e7
+R 0235f59a00c54f640f61c277b29bcc69
+U mistachkin
+Z 015e7c1f4d0390bbef94656d13220477
diff --git a/manifest.uuid b/manifest.uuid
index a48b14490b..efdad925f7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-87e25fc472604b3978811be53991104c665a95e7
\ No newline at end of file
+8bb6e6fcedf7d0ae796b8848593106c921ebf21a
\ No newline at end of file