From: drh <>
Date: Fri, 28 Oct 2022 18:52:05 +0000 (+0000)
Subject: Fix harmless compiler warnings in testing code.
X-Git-Tag: version-3.40.0~66
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=053bb22f35c5dd153a62158ed2cc6376b5979212;p=thirdparty%2Fsqlite.git

Fix harmless compiler warnings in testing code.

FossilOrigin-Name: 2f53612388507f9b1ecbec3c15281825beab54b8062d97d0ab6f009c5fed347b
---

diff --git a/ext/recover/dbdata.c b/ext/recover/dbdata.c
index 2ad7e639ce..dca468f7b8 100644
--- a/ext/recover/dbdata.c
+++ b/ext/recover/dbdata.c
@@ -697,9 +697,9 @@ static int dbdataEof(sqlite3_vtab_cursor *pCursor){
 ** otherwise.
 */
 static int dbdataIsFunction(const char *zSchema){
-  int n = strlen(zSchema);
+  size_t n = strlen(zSchema);
   if( n>2 && zSchema[n-2]=='(' && zSchema[n-1]==')' ){
-    return n-2;
+    return (int)n-2;
   }
   return 0;
 }
diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index d3783b3200..f18903f658 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -2261,7 +2261,7 @@ static int recoverVfsDetectPagesize(
         }
       }
     }
-    if( pgsz>p->detected_pgsz ){
+    if( pgsz>(u32)p->detected_pgsz ){
       p->detected_pgsz = pgsz;
       p->nReserve = nReserve;
     }
diff --git a/manifest b/manifest
index d539c800db..0be8e46c1c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssqlite3recover()\ssupport\sto\sfuzzcheck.
-D 2022-10-28T18:35:06.668
+C Fix\sharmless\scompiler\swarnings\sin\stesting\scode.
+D 2022-10-28T18:52:05.114
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -385,7 +385,7 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/dbdata.c 76b4040547dc5f448f5d4599ccde8ab4311e0ab9df002adc410fef3f13fd822e
+F ext/recover/dbdata.c 3ae32f9b7f02a141889b9075beb87895a826d0fcf3b702b8251cbb0dd3c91a83
 F ext/recover/recover1.test e08dc7a0513eab9de33e7b8e2260b9538bedb57c9bd6fbb278f328d29a102827
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
@@ -398,7 +398,7 @@ F ext/recover/recoverpgsz.test 93e970eab05e4e89f8fd6b1bd23f9ec137ea09857e66ba0d4
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoverslowidx.test f356bb9fba7ffd6fc50e045e419464f0129ac6e24decf6e919584f79c3493727
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 69656992f1dd3b0645c30e465372bb73c6f64f9620845622424fec8f84a8b42b
+F ext/recover/sqlite3recover.c ec7b6cddae10476312ff22c0a59d97d550fefba3e85fce3750f722d3520350f5
 F ext/recover/sqlite3recover.h f698ccc94bd4da38761035415ad08c4549a408491ff9fd5f52d34d2214f64e36
 F ext/recover/test_recover.c 61ec931e47abca6b2210f46239cafd9f3060741605e3d3c45a7c7a53f63dd957
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -1165,7 +1165,7 @@ F test/fuzzdata8.db 653423800b7671e67caa740e977d80e1360f0d69e9992851f3ea5c4a69a2
 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8
 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14
 F test/fuzzerfault.test f64c4aef4c9e9edf1d6dc0d3f1e65dcc81e67c996403c88d14f09b74807a42bc
-F test/fuzzinvariants.c 760a1004ae4c4cef398310631ea6d441c5e8297af0f688a2dc7a467afd22df33
+F test/fuzzinvariants.c 7877178eaa10eb3ea986f81a7010efc371ccd3e13ee5b14fa290b0459002a36a
 F test/gcfault.test dd28c228a38976d6336a3fc42d7e5f1ad060cb8c
 F test/gencol1.test cc0dbb0ee116e5602e18ea7d47f2a0f76b26e09a823b7c36ef254370c2b0f3c1
 F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98
@@ -1809,7 +1809,7 @@ F test/veryquick.test 57ab846bacf7b90cf4e9a672721ea5c5b669b661
 F test/view.test d16e49e89ada6137d1447777ef2a74574526a3b024e6733bf53ae2960da8c17c
 F test/view2.test db32c8138b5b556f610b35dfddd38c5a58a292f07fda5281eedb0851b2672679
 F test/view3.test ad8a8290ee2b55ff6ce66c9ef1ce3f1e47926273a3814e1c425293e128a95456
-F test/vt02.c b94cbc59aba9b5a47f645fc8fc8aa7bdd96e686b98f3766e4080659cc07bf631
+F test/vt02.c 33ecddc0832d4cd24e9e9fa83d868981b1e049462f4ec9080710353f6479a534
 F test/vtab1.test 09a72330d0f31eda2ffaa828b06a6b917fb86250ee72de0301570af725774c07
 F test/vtab2.test 14d4ab26cee13ba6cf5c5601b158e4f57552d3b055cdd9406cf7f711e9c84082
 F test/vtab3.test b45f47d20f225ccc9c28dc915d92740c2dee311e
@@ -2054,8 +2054,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P e85387590061edbb6cdc04de792ab86f43afaa5c8d1b0792206cb5b481c7d76a
-R dbf1d43633dc57fc37ff5c25dc929e02
+P e65c5bdc5bd6e1989c3de59798ff0a761125fc490fdec8c7671ca70ed688c4f8
+R 2092bbb0212ed06397996f6b20b31c55
 U drh
-Z 6124d4e303fc5fa0fccc696b151a8f8d
+Z 91f846334499b4960f1a923dbe22c496
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ba8bf21b2a..8160792046 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e65c5bdc5bd6e1989c3de59798ff0a761125fc490fdec8c7671ca70ed688c4f8
\ No newline at end of file
+2f53612388507f9b1ecbec3c15281825beab54b8062d97d0ab6f009c5fed347b
\ No newline at end of file
diff --git a/test/fuzzinvariants.c b/test/fuzzinvariants.c
index c2df82b4aa..c0ed2dde58 100644
--- a/test/fuzzinvariants.c
+++ b/test/fuzzinvariants.c
@@ -263,7 +263,7 @@ static char *fuzz_invariant_sql(sqlite3_stmt *pStmt, int iCnt){
   pTest = sqlite3_str_new(0);
   sqlite3_str_appendf(pTest, "SELECT %s* FROM (",  
                       bDistinct ? "DISTINCT " : "");
-  sqlite3_str_append(pTest, zIn, nIn);
+  sqlite3_str_append(pTest, zIn, (int)nIn);
   sqlite3_str_append(pTest, ")", 1);
   rc = sqlite3_prepare_v2(db, sqlite3_str_value(pTest), -1, &pBase, 0);
   if( rc ){
diff --git a/test/vt02.c b/test/vt02.c
index b4e76a891b..40bd6fcb3e 100644
--- a/test/vt02.c
+++ b/test/vt02.c
@@ -377,7 +377,7 @@ static int vt02Filter(
     pCur->i = 0;
     for(m=1000, i=0; i<=e; i++, m /= 10){
       sqlite3_int64 v;
-      sqlite3_value *pVal = 0;
+      pVal = 0;
       if( sqlite3_vtab_in_first(0, &pVal)!=SQLITE_MISUSE
        || sqlite3_vtab_in_first(argv[iArg], &pVal)!=SQLITE_MISUSE
       ){
@@ -588,7 +588,6 @@ static void sqlite3BestIndexLog(
     char *zSql;
     int iCol = pInfo->aConstraint[i].iColumn;
     int op = pInfo->aConstraint[i].op;
-    int rc;
     const char *zCol;
     if( op==SQLITE_INDEX_CONSTRAINT_LIMIT
      || op==SQLITE_INDEX_CONSTRAINT_OFFSET