Add a NEVER() to an unreachable branch.

FossilOrigin-Name: 6b6eb38979d68c06e382620c8813d6b67a3de02c4a7a029c84f924b9a2e380c6

diff --git a/manifest b/manifest
index 9996c0606c7e25148bbe1bcb0b63a27c2ac6e676..5225d955500335c4d40240aeb69694f0dfd4be6e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sminor\scode\sindentation\sinconsistencies.\s\sNo\sfunction\schanges.
-D 2023-09-16T16:23:20.928
+C Add\sa\sNEVER()\sto\san\sunreachable\sbranch.
+D 2023-09-16T16:39:27.998
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -708,7 +708,7 @@ F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c 80548297dc0e1fb3139cdebffb5a1bcac3dfac66d791012dd74838e70445072d
 F src/printf.c e3ba080e2f409f9bfcc8d34724e6fc160e9c718dc92d0548f6b71b8b6f860ce2
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
-F src/resolve.c 2aaa1d5c69f40529951efe4901263e2b82bc95e3e3248088a7a4c887db740bdc
+F src/resolve.c 0c3046b88901336709cd09f474303a16fc54bce13a2befcab66d0fa6b44ca869
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 7f9155185be78902818b21c2cd3e33f01b4306279a15d6719eb1bbb9779034aa
 F src/shell.c.in 62708bea44d4e43aa7b1270ed422d1d29e82297924d4e0f223c39336a3f582f8
@@ -2121,8 +2121,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 9e9ff4ca3a205d0b599634782a5ad389fbe4823663550f48c54ca35dbc660dc7
-R 5fdbb991511b12e8d6117dcb5b9dc4a0
+P 05107a0ae1456b746d3119af68d39532fad23a7eef88c09a9ef46ab7f8da4b9d
+R fc73d4482ca092115650da8908e20813
 U drh
-Z 8b66894d46fa8ad371272d9e9ecf2ba6
+Z 760a28483bfb77f8bee5209678f08535
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 9fef7ce54db4bcab5d0ddd4f03df18771a62e597..bb06f828cf96a94b35af61cdb1dc805fc1fdbce9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-05107a0ae1456b746d3119af68d39532fad23a7eef88c09a9ef46ab7f8da4b9d
\ No newline at end of file
+6b6eb38979d68c06e382620c8813d6b67a3de02c4a7a029c84f924b9a2e380c6
\ No newline at end of file

diff --git a/src/resolve.c b/src/resolve.c
index d8432903437c7e949705545dfc2ec6ab9909153b..bd890c9f8d8f28c418b08a3aeda0777201215881 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -130,7 +130,7 @@ int sqlite3MatchEName(
   int n;
   const char *zSpan;
   int eEName = pItem->fg.eEName;
-  if( eEName!=ENAME_TAB && (eEName!=ENAME_ROWID || pbRowid==0) ){
+  if( eEName!=ENAME_TAB && (eEName!=ENAME_ROWID || NEVER(pbRowid==0)) ){
     return 0;
   }
   assert( pbRowid==0 || *pbRowid==0 );