From: drh <>
Date: Fri, 4 Feb 2022 13:15:01 +0000 (+0000)
Subject: Fix various harmless compiler warnings.
X-Git-Tag: version-3.38.0~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=69b0ce33fd4b1be019be2d64dd99c6bc7ccf5693;p=thirdparty%2Fsqlite.git

Fix various harmless compiler warnings.

FossilOrigin-Name: 70049342d5ad57ea3e863bba19253934b868bacdd1c26c9371bac024a829badf
---

diff --git a/manifest b/manifest
index 3f02ec9d75..4eafb3043f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C For\sthe\sMULTI-INDEX-OR\soptimization,\swhen\spushing\sdown\sWHERE\sclause\sterms\sfrom\nthe\smain\squery\sinto\sthe\svarious\sOR-term\ssubqueries,\sdo\snot\spush\sdown\sslices\nof\sa\svector\scomparison,\ssince\sthe\sright-hand\soperand\sof\sthe\scomparison\smight\nhave\sonly\sbeen\sinitialized\sin\sa\sdifferent\sOR\sbranch\sthat\swas\snot\staken.\ndbsqlfuzz\s80a9fade844b4fb43564efc972bcb2c68270f5d1.
-D 2022-02-04T13:05:29.719
+C Fix\svarious\sharmless\scompiler\swarnings.
+D 2022-02-04T13:15:01.508
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -503,17 +503,17 @@ F src/date.c 41627dec396f3d33e2c317a065f9d59bb535982b2ea3a561c96e4d4cf1137b65
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c b5f1716b4d723db48254ee0f896e362cd029e865e05414139ea7f539f3884e1d
-F src/expr.c 9658bccd1598211ace848c8ca9480dbf8be08dfee1db5cf03897b34b7b6e8fef
+F src/expr.c 31d23e6b57827b4cb8f0054f44e2ed86feb1dfcaa9b0c4d6c960b42536a17ca0
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 06e4ac33031b02dde7130c12e79cddf4dc5cfa72b23d8e63a3c26878fc9c1d3c
-F src/func.c 8fddc42bce95d17938252a543f86fe29e479366e80fbd112a1822913b6247776
+F src/func.c 5a0379450bd19ca5cb2d65327b0df6466a14fa0f06f9355329c3e0eec483519a
 F src/global.c 1f56aead86e8a18c4415638f5e6c4d0a0550427f4b3f5d065ba5164cc09c22e8
 F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 1eea44389de3768ac98588c1410171cd53e7c6ad1af74049983dcbac82093de0
-F src/json.c 78fdec9af3a8bfb5ae685707b2701276fec1942b8f5f26689b2701debe32bcd2
+F src/json.c 225b00422112ecd7094a555f3ace16b25d7d5894062b823269ed03899907c2a2
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c aa919a6a7884f8b34d7b791841b24d14b1b0ab43f45b3940f4851043b2855c0c
 F src/main.c 2b6b0dbfeb14d4bb57e368604b0736b2aa42b51b00339d399b01d6b1fc9b4960
@@ -640,7 +640,7 @@ F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 F src/where.c 31bc1f43b0bf679e93c3e7a7d67cbcaddc7ae746694b149b282427d337b06caa
-F src/whereInt.h 099c7fa273f34afa5adc7f25dcacc48df70392ce224089b641b1c9c5b01d5598
+F src/whereInt.h 15d2975c3b4c193c78c26674400a840da8647fe1777ae3b026e2d15937b38a03
 F src/wherecode.c 4a0dd0403e1c9b628a420eefbe1d60da0003356de6ee18e6707480c9b995bae7
 F src/whereexpr.c 2da56404a024dc8dc41a31d8b498eed2c7c6b0bb412150d88cb3327516aa3b9f
 F src/window.c dfaec4abc6012cbc18e4a202ca3a5d5a0efcc4011d86a06d882ddaab8aedee4d
@@ -1943,8 +1943,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 f9b763042c5c4446115c5375a8e4731e522e36ad9fc53e9ef775de9bc297ea19
-R 928b302c497557d2f34fa5bbc849c67c
+P 9f67ad00cd38b7c5ec6d14b379e1a611777bbdf6901d843a80712ba7d94d6d33
+R ed2fd6b08e6120318ad847a61dee5a51
 U drh
-Z 80d96bf6fd3b06fc995fb22f494a3906
+Z 871646465b8062211df8c4f3cf586a8c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9993c3d6b7..2dd02dd9db 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9f67ad00cd38b7c5ec6d14b379e1a611777bbdf6901d843a80712ba7d94d6d33
\ No newline at end of file
+70049342d5ad57ea3e863bba19253934b868bacdd1c26c9371bac024a829badf
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index d58097cb61..af28fd6d29 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -3497,7 +3497,6 @@ static void sqlite3ExprCodeIN(
   }else{
     destStep2 = destStep6 = sqlite3VdbeMakeLabel(pParse);
   }
-//  if( pParse->nErr ) goto sqlite3ExprCodeIN_finished;
   for(i=0; i<nVector; i++){
     Expr *p = sqlite3VectorFieldSubexpr(pExpr->pLeft, i);
     if( pParse->nErr ) goto sqlite3ExprCodeIN_oom_error;
diff --git a/src/func.c b/src/func.c
index 81accc9cc3..d7ca756de8 100644
--- a/src/func.c
+++ b/src/func.c
@@ -106,6 +106,7 @@ static void subtypeFunc(
   int argc,
   sqlite3_value **argv
 ){
+  UNUSED_PARAMETER(argc);
   sqlite3_result_int(context, sqlite3_value_subtype(argv[0]));
 }
 
diff --git a/src/json.c b/src/json.c
index 3f12f03fd1..ab1d32d6a5 100644
--- a/src/json.c
+++ b/src/json.c
@@ -2666,7 +2666,7 @@ int sqlite3JsonTableFunctions(sqlite3 *db){
     { "json_each",            &jsonEachModule               },
     { "json_tree",            &jsonTreeModule               },
   };
-  int i;
+  unsigned int i;
   for(i=0; i<sizeof(aMod)/sizeof(aMod[0]) && rc==SQLITE_OK; i++){
     rc = sqlite3_create_module(db, aMod[i].zName, aMod[i].pModule, 0);
   }
diff --git a/src/whereInt.h b/src/whereInt.h
index 8cd4144874..3fc39f6b4a 100644
--- a/src/whereInt.h
+++ b/src/whereInt.h
@@ -123,8 +123,8 @@ struct WhereLoop {
     } btree;
     struct {               /* Information for virtual tables */
       int idxNum;            /* Index number */
-      u8 needFree : 1;       /* True if sqlite3_free(idxStr) is needed */
-      u8 bOmitOffset : 1;    /* True to let virtual table handle offset */
+      u32 needFree : 1;      /* True if sqlite3_free(idxStr) is needed */
+      u32 bOmitOffset : 1;   /* True to let virtual table handle offset */
       i8 isOrdered;          /* True if satisfies ORDER BY */
       u16 omitMask;          /* Terms that may be omitted */
       char *idxStr;          /* Index identifier string */