1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-10 01:02:56 +03:00

NEVER() and ALWAYS() macros tagging unreachable branches.

FossilOrigin-Name: 34b877742ef78e9bb3f16815180f4ad9cd722beb1d610f713400a3b25d68aa9b
This commit is contained in:
drh
2020-01-02 22:23:01 +00:00
parent 378ca1eab3
commit 9fc1b9af36
4 changed files with 15 additions and 14 deletions

View File

@@ -140,7 +140,7 @@ int sqlite3MatchEName(
){
int n;
const char *zSpan;
if( pItem->eEName!=ENAME_TAB ) return 0;
if( NEVER(pItem->eEName!=ENAME_TAB) ) return 0;
zSpan = pItem->zEName;
for(n=0; ALWAYS(zSpan[n]) && zSpan[n]!='.'; n++){}
if( zDb && (sqlite3StrNICmp(zSpan, zDb, n)!=0 || zDb[n]!=0) ){
@@ -451,9 +451,9 @@ static int lookupName(
pEList = pNC->uNC.pEList;
assert( pEList!=0 );
for(j=0; j<pEList->nExpr; j++){
char *zAs;
char *zAs = pEList->a[j].zEName;
if( pEList->a[j].eEName==ENAME_NAME
&& (zAs = pEList->a[j].zEName)!=0
&& ALWAYS(zAs!=0)
&& sqlite3StrICmp(zAs, zCol)==0
){
Expr *pOrig;
@@ -1125,7 +1125,7 @@ static int resolveAsName(
for(i=0; i<pEList->nExpr; i++){
char *zAs = pEList->a[i].zEName;
if( pEList->a[i].eEName==ENAME_NAME
&& (zAs = pEList->a[i].zEName)!=0
&& ALWAYS(zAs!=0)
&& sqlite3StrICmp(zAs, zCol)==0
){
return i+1;