From: drh <drh@noemail.net>
Date: Sat, 4 Jan 2020 19:12:13 +0000 (+0000)
Subject: Fix harmless compiler warnings.
X-Git-Tag: version-3.31.0~66
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=17aceebab75c0057cbf224d43316e5fa6cf040f7;p=thirdparty%2Fsqlite.git

Fix harmless compiler warnings.

FossilOrigin-Name: 8452fe03430d34abecab618d6136b863630f91d68d69ebbc115f808bc81c3817
---

diff --git a/manifest b/manifest
index cf931dd1fb..2e28981e59 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Omit\sthe\somit\sflat\sfrom\seq\sconstraints\son\scolumn\s"name"\sof\sdbstat\svirtual\stables.\sFix\sfor\s[74a4c386].
-D 2020-01-04T18:38:58.874
+C Fix\sharmless\scompiler\swarnings.
+D 2020-01-04T19:12:13.469
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -600,7 +600,7 @@ F src/upsert.c 2920de71b20f04fe25eb00b655d086f0ba60ea133c59d7fa3325c49838818e78
 F src/utf.c 2f0fac345c7660d5c5bd3df9e9d8d33d4c27f366bcfb09e07443064d751a0507
 F src/util.c 2c92bc706bbdb1c45a25180291e7e05a56e297aa5dd7b2bcd2b1c47e8bb05b17
 F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf
-F src/vdbe.c 8a1cf75fc4be7a7d49f8f22f72121c9840937bbe704024260a08cd9997189deb
+F src/vdbe.c d0e32097985670ff4afee241f2c1f6f466fe12b41f9c2d6a014ec0ba8a793f6f
 F src/vdbe.h defd693289c7bb8d325f109be9490c77138061211a116827da7244b6015a4934
 F src/vdbeInt.h e02ccac0334f7c71c952210657e6e18de1917605887c7bc6167a80a17f62da18
 F src/vdbeapi.c 1252d80c548711e47a6d84dae88ed4e95d3fbb4e7bd0eaa1347299af7efddf02
@@ -615,7 +615,7 @@ F src/wal.c 15a2845769f51ba132f9cf0b2c7a6887a91fc8437892dbcce9fcdc68b66d60a1
 F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
 F src/walker.c a137468bf36c92e64d2275caa80c83902e3a0fc59273591b96c6416d3253d05d
 F src/where.c 4ca6c066554247a69dc54616755f68c301c16e23ec36d40170f07763fd0737b3
-F src/whereInt.h d2b771335083070ff82991cc43603e2db27b7ba1313da72de092c50c68f2be9c
+F src/whereInt.h e1d1db6bbec0ba4f345acc338f956c8237a6f06413afa68c6414e82fb5b06745
 F src/wherecode.c 75ad6cbb8dfe585ffe0fc71008750b5158fc4811c3a498327033920b18f0a4be
 F src/whereexpr.c 4b34be1434183e7bb8a05d4bf42bd53ea53021b0b060936fbd12062b4ff6b396
 F src/window.c 659d613248f8bb8630f51409dc08235e4494c3c84162a535d9f88b38515f390a
@@ -1853,7 +1853,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 182a898b14d585edd5fcfdcd6584c957911f0d81773d2868f16b5762dec031ca
-R e5d20f1d7a3c3631aa9f23cc00d086d7
-U dan
-Z 2755770051f083685d92f69a4addf7e4
+P cfff5cb2279088aa66f435bd0d627b2c74c9a99ad9addfd44a4df8ba770b795a
+R 5d16430269a33945616966e2b0b7c322
+U drh
+Z 8726c818ce12b415934c3be6ffc42642
diff --git a/manifest.uuid b/manifest.uuid
index 99505f377c..635c137be4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cfff5cb2279088aa66f435bd0d627b2c74c9a99ad9addfd44a4df8ba770b795a
\ No newline at end of file
+8452fe03430d34abecab618d6136b863630f91d68d69ebbc115f808bc81c3817
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index 5b8b1372b0..b677285a43 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -7928,6 +7928,12 @@ default: {          /* This is really OP_Noop, OP_Explain */
       if( opProperty & OPFLG_OUT3 ){
         registerTrace(pOrigOp->p3, &aMem[pOrigOp->p3]);
       }
+      if( opProperty==0xff ){
+        /* Never happens.  This code exists to avoid a harmless linkage
+        ** warning aboud sqlite3VdbeRegisterDump() being defined but not
+        ** used. */
+        sqlite3VdbeRegisterDump(p);
+      }
     }
 #endif  /* SQLITE_DEBUG */
 #endif  /* NDEBUG */
diff --git a/src/whereInt.h b/src/whereInt.h
index ad433652f4..dbc6f1872a 100644
--- a/src/whereInt.h
+++ b/src/whereInt.h
@@ -473,10 +473,10 @@ struct WhereInfo {
   i8 nOBSat;                /* Number of ORDER BY terms satisfied by indices */
   u8 eOnePass;              /* ONEPASS_OFF, or _SINGLE, or _MULTI */
   u8 eDistinct;             /* One of the WHERE_DISTINCT_* values */
-  u8 bDeferredSeek : 1;     /* Uses OP_DeferredSeek */
-  u8 untestedTerms : 1;     /* Not all WHERE terms resolved by outer loop */
-  u8 bOrderedInnerLoop : 1; /* True if only the inner-most loop is ordered */
-  u8 sorted : 1;            /* True if really sorted (not just grouped) */
+  unsigned bDeferredSeek :1;   /* Uses OP_DeferredSeek */
+  unsigned untestedTerms :1;   /* Not all WHERE terms resolved by outer loop */
+  unsigned bOrderedInnerLoop:1;/* True if only the inner-most loop is ordered */
+  unsigned sorted :1;          /* True if really sorted (not just grouped) */
   LogEst nRowOut;           /* Estimated number of output rows */
   int iTop;                 /* The very beginning of the WHERE loop */
   WhereLoop *pLoops;        /* List of all WhereLoop objects */