Change a datatype from i16 to int to appease Converity and help eliminate

a false-positive.

FossilOrigin-Name: 5b560ec49041d89c87ea3315d8fc17f7fb0e03a82091934be7373b290183f82e

diff --git a/manifest b/manifest
index ffe48d94fb8725506d17af83979d2a526fd21ce0..031fcc653896f5b6eb532b8768db38a0a17af0aa 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\scksumvfs\sextension\sso\sthat\sit\swill\snot\sregister\sitself\smore\sthan\nonce.
-D 2020-05-26T20:33:18.026
+C Change\sa\sdatatype\sfrom\si16\sto\sint\sto\sappease\sConverity\sand\shelp\seliminate\na\sfalse-positive.
+D 2020-05-27T00:02:07.312
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,7 +485,7 @@ F src/date.c b29b349d277e3d579dcc295b24c0a2caed83fd8f090a9f7cbe6070c0fd662384
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 793deaf88a0904f88285d93d6713c636d55ede0ffd9f08d10f4ea825531d367f
 F src/delete.c 88047c8e59878c920fce14582bc1dde4d81157d1ca5ffdf36c2907e6d41996c4
-F src/expr.c 7a388ddfac396635f38630429a2777fa36e9c1604e48114cb53be7316487a868
+F src/expr.c 4d5ca337ac207a15e647a1db2356d14282647afc8edca5ff577601048c88ceb4
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 4b575423b0a5d4898b1a7868ce985cf1a8ad91c741c9abbb108ff02536d20f41
 F src/func.c 2333eb4277f55a5efdc12ef754e7d7ec9105d257b2fd00301d23ce1e8fa67dc0
@@ -1866,7 +1866,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 0e898f4fed1c851cb90f940175110e632a20668a285d39f5f94f7358c3064882
-R 72833d867a696e36a90b89db4d555cd5
+P d5cdd57150db914b61b8b9c61c6caac9690fe7b647ee2c003e75b9b62be62752
+R e25f872a3296dd9d4a4620f30c7f47be
 U drh
-Z 876d4518a5496ca7a456d49d64fbf19e
+Z 7d2d03c71662193ff9282263dd7aee70

diff --git a/manifest.uuid b/manifest.uuid
index e910202d5779f7e0fcf8dd4b562b1eb4a2794253..1bb3e87e66ba558a0716a1f0d8c9c1a59174cdf9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d5cdd57150db914b61b8b9c61c6caac9690fe7b647ee2c003e75b9b62be62752
\ No newline at end of file
+5b560ec49041d89c87ea3315d8fc17f7fb0e03a82091934be7373b290183f82e
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 69cd674efb58142facd7cece48e0590418d0f5c4..663c15e49265afe58495a8ed29a0d8b873b4f211 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -2552,7 +2552,7 @@ int sqlite3FindInIndex(
   if( pParse->nErr==0 && (p = isCandidateForInOpt(pX))!=0 ){
     sqlite3 *db = pParse->db;              /* Database connection */
     Table *pTab;                           /* Table <table>. */
-    i16 iDb;                               /* Database idx for pTab */
+    int iDb;                               /* Database idx for pTab */
     ExprList *pEList = p->pEList;
     int nExpr = pEList->nExpr;