From: drh <drh@noemail.net>
Date: Wed, 1 Nov 2017 19:58:25 +0000 (+0000)
Subject: Fix harmless compiler warnings in sqlite3_checker.exe
X-Git-Tag: version-3.22.0~213
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a48a290bcc6f7f81d0378aa5fc4ad51ee6e182cc;p=thirdparty%2Fsqlite.git

Fix harmless compiler warnings in sqlite3_checker.exe

FossilOrigin-Name: 491f867b377b3b9e00bd713fb07df00207673f9eca0e7d5b7af7974082c8e3f0
---

diff --git a/ext/repair/checkfreelist.c b/ext/repair/checkfreelist.c
index cd2801e040..990be4afa7 100644
--- a/ext/repair/checkfreelist.c
+++ b/ext/repair/checkfreelist.c
@@ -166,7 +166,7 @@ static int checkFreelist(
     u32 i;
     u32 iTrunk = (u32)sqlite3_column_int(pTrunk, 0);
     const u8 *aData = (const u8*)sqlite3_column_blob(pTrunk, 1);
-    int nData = sqlite3_column_bytes(pTrunk, 1);
+    u32 nData = (u32)sqlite3_column_bytes(pTrunk, 1);
     u32 iNext = get4byte(&aData[0]);
     u32 nLeaf = get4byte(&aData[4]);
 
diff --git a/ext/repair/checkindex.c b/ext/repair/checkindex.c
index 362e199168..fa8c713f7c 100644
--- a/ext/repair/checkindex.c
+++ b/ext/repair/checkindex.c
@@ -263,7 +263,7 @@ static void cidxFinalize(int *pRc, sqlite3_stmt *pStmt){
 char *cidxStrdup(int *pRc, const char *zStr){
   char *zRet = 0;
   if( *pRc==SQLITE_OK ){
-    int n = strlen(zStr);
+    int n = (int)strlen(zStr);
     zRet = cidxMalloc(pRc, n+1);
     if( zRet ) memcpy(zRet, zStr, n+1);
   }
@@ -493,7 +493,7 @@ static int cidxDecodeAfter(
 ){
   char **azAfter;
   int rc = SQLITE_OK;
-  int nAfterKey = strlen(zAfterKey);
+  int nAfterKey = (int)strlen(zAfterKey);
 
   azAfter = cidxMalloc(&rc, sizeof(char*)*nCol + nAfterKey+1);
   if( rc==SQLITE_OK ){
diff --git a/manifest b/manifest
index 47e05b0082..9e0fd087b8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sthe\sJSON1\sextension\sis\savailable\sto\ssqlite3_checker.exe
-D 2017-11-01T19:50:11.569
+C Fix\sharmless\scompiler\swarnings\sin\ssqlite3_checker.exe
+D 2017-11-01T19:58:25.196
 F Makefile.in b142eb20482922153ebc77b261cdfd0a560ed05a81e9f6d9a2b0e8192922a1d2
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc a55372a22454e742ba7c8f6edf05b83213ec01125166ad7dcee0567e2f7fc81b
@@ -327,8 +327,8 @@ F ext/rbu/sqlite3rbu.c 64bd08c1011456f90564ed167abce3a9c2af421a924b21eb57231e078
 F ext/rbu/sqlite3rbu.h b42bcd4d8357268c6c39ab2a60b29c091e89328fa8cc49c8fac5ab8d007e79b2
 F ext/rbu/test_rbu.c 7073979b9cc80912bb03599ac8d85ab5d3bf03cfacd3463f2dcdd7822997533a
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
-F ext/repair/checkfreelist.c 0abb84b4545016d57ba1a2aa8884c72c73ed838968909858c03bc1f38fb6b054
-F ext/repair/checkindex.c a013a0a165b2e6f2b278a31566da04913856c88d6ed5457d477f89e78d5979d9
+F ext/repair/checkfreelist.c 0dbae18c1b552f58d64f8969e4fb1e7f11930c60a8c2a9a8d50b7f15bdfd54bd
+F ext/repair/checkindex.c 73f26fc1e2e17d68ede5db5b0aaf4869f2d6182f45f3d3624befc503c0f04a70
 F ext/repair/sqlite3_checker.c.in 4a5a3af3f450fe503e5a2985e98516dc2a6b9ad247449e284c1cf140fc91720f
 F ext/repair/sqlite3_checker.tcl 4820d7f58428d47336874b5a148a95b4dad38fe5da72286c01a861590b8f8337
 F ext/repair/test/README.md 34b2f542cf5be7bffe479242b33ee3492cea30711e447cc4a1a86cb5915f419e
@@ -420,7 +420,7 @@ F src/callback.c 28a8ede982fde4129b828350f78f2c01fe7d12c74d1a0a05d7108ab36f30868
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c ff1be3eed7bdd75aaca61ca8dc848f7c9f850ef2fb9cb56f2734e922a098f9c0
 F src/date.c 48f743d88bbe88f848532d333cca84f26e52a4f217e86f86be7fc1b919c33d74
-F src/dbpage.c 003755140e21b917c0a39e70907c1e4612b25d1e24b9a3c64b0d638c8ecb5dc2
+F src/dbpage.c 432f46fb47c99ae1f0e2863fe595038a6f9d3b59f4a3dabe5f86ec2a88758fde
 F src/dbstat.c 7a4ba8518b6369ef3600c49cf9c918ad979acba610b2aebef1b656d649b96720
 F src/delete.c 21a5f1812fdb599e9f7afb9f650bdabab60a3afd51d7e94e539c982f647b0023
 F src/expr.c 0016b95aed1df47ebc0eb7415bd621841d72dbffd3bfb62210e50e71d83b4691
@@ -1673,7 +1673,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 0c5d18a01ec77f784d5434c5465ab8da9a0c365a58d4bd8551872ca90aaf42d6
-R f83c5c1798f6f791a77e395a421e7535
+P a946a8ed46ba76b9a09bcbac58000d3d92db1f08a98f6cc12365be696d8921de
+R 7ee45d8c7d2f00dd882d0691ca6a1bfb
 U drh
-Z b827e3b3bff13979721cde0c77e4ccc0
+Z 0f28cc7179e20c43d298dd1935e3a35c
diff --git a/manifest.uuid b/manifest.uuid
index 05400f1a8f..7f5fcadcf3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a946a8ed46ba76b9a09bcbac58000d3d92db1f08a98f6cc12365be696d8921de
\ No newline at end of file
+491f867b377b3b9e00bd713fb07df00207673f9eca0e7d5b7af7974082c8e3f0
\ No newline at end of file
diff --git a/src/dbpage.c b/src/dbpage.c
index f287e72229..75e4c42e67 100644
--- a/src/dbpage.c
+++ b/src/dbpage.c
@@ -329,7 +329,7 @@ static int dbpageUpdate(
     goto update_fail;
   }
   pBt = pTab->db->aDb[iDb].pBt;
-  if( pgno<1 || pBt==0 || pgno>sqlite3BtreeLastPage(pBt) ){
+  if( pgno<1 || pBt==0 || pgno>(int)sqlite3BtreeLastPage(pBt) ){
     zErr = "bad page number";
     goto update_fail;
   }